Added GetLastNtError(), corrected STROBJ definition

svn path=/trunk/; revision=5541

reactos/include/ddk/winddi.h

@@ -41,7 +41,6 @@ typedef PVOID  PGLYPHDATA;
 typedef PVOID  PLINEATTRS;
 typedef DWORD  MIX;
 typedef DWORD  ROP4;
-typedef PVOID  PSTROBJ;
 typedef PVOID  PTTPOLYGONHEADER;
 typedef PVOID  PVIDEOMEMORY;
 
@@ -672,6 +671,16 @@ typedef struct _XFORMOBJ
   /* FIXME: what does this beast look like?  */
 } XFORMOBJ, *PXFORMOBJ;
 
+typedef struct _STROBJ
+{
+  ULONG  cGlyphs;
+  FLONG  flAccel;
+  ULONG  ulCharInc;
+  RECTL  rclBkGround;
+  GLYPHPOS  *pgp;
+  LPWSTR  pwszOrg;
+} STROBJ, *PSTROBJ;
+
 /*
  * Functions Prefixed with Drv are calls made from GDI to DDI, and
  * everything else are calls made from DDI to GDI.  DDI is

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.16 2003/07/27 18:37:23 dwelch Exp $
+/* $Id: objects.h,v 1.17 2003/08/12 20:08:45 royce Exp $
  * 
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -108,10 +108,9 @@ typedef struct _PATHGDI {
   PATHOBJ		PathObj;
 } PATHGDI;
 
-/*ei Fixme! Fix STROBJ */
 typedef struct _STRGDI {
   ENGOBJ 		Header;
-  //STROBJ		StrObj;
+  STROBJ		StrObj;
 } STRGDI;
 
 typedef BOOL STDCALL (*PFN_BitBlt)(PSURFOBJ, PSURFOBJ, PSURFOBJ, PCLIPOBJ,

reactos/subsys/win32k/include/error.h

@@ -9,6 +9,9 @@ VOID FASTCALL
 SetLastWin32Error(
   DWORD Status);
 
+NTSTATUS FASTCALL
+GetLastNtError();
+
 #endif /* __WIN32K_ERROR_H */
 
 /* EOF */

reactos/subsys/win32k/misc/error.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: error.c,v 1.5 2003/05/18 17:16:17 ea Exp $
+/* $Id: error.c,v 1.6 2003/08/12 20:08:45 royce Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -47,4 +47,17 @@ SetLastWin32Error(DWORD Status)
     }
 }
 
+NTSTATUS FASTCALL
+GetLastNtError()
+{
+  // FIXME - not 100% sure this is correct
+  PTEB Teb = NtCurrentTeb();
+
+  if ( NULL != Teb )
+    {
+      return Teb->LastStatusValue;
+    }
+  return 0;
+}
+
 /* EOF */