[ros-diffs] [sginsberg] 42640: - Sync some headers to trunk, fix misc. msvc errors in the code -- win32k now compiles

Author: sginsberg
Date: Wed Aug 12 22:45:35 2009
New Revision: 42640

URL: http://svn.reactos.org/svn/reactos?rev=42640&view=rev
Log:
- Sync some headers to trunk, fix misc. msvc errors in the code -- win32k now compiles

Modified:
    branches/arwinss/reactos/include/crt/float.h
    branches/arwinss/reactos/include/ddk/winddk.h
    branches/arwinss/reactos/include/dxsdk/ddraw.h
    branches/arwinss/reactos/include/reactos/debug.h
    branches/arwinss/reactos/include/reactos/probe.h
    branches/arwinss/reactos/include/reactos/win32k/rosuser.h
    branches/arwinss/reactos/subsystems/win32/win32k/eng/engfile.c
    branches/arwinss/reactos/subsystems/win32/win32k/eng/engrtl.c
    branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c
    branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h
    branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h
    branches/arwinss/reactos/subsystems/win32/win32k/main/err.c
    branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c

Modified: branches/arwinss/reactos/include/crt/float.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/crt/flo…
==============================================================================
--- branches/arwinss/reactos/include/crt/float.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/crt/float.h [iso-8859-1] Wed Aug 12 22:45:35 2009
@@ -16,7 +16,9 @@
  *
  */
 
+#ifdef __GNUC__
 #include_next<float.h>
+#endif
 
 #ifndef _MINGW_FLOAT_H_
 #define _MINGW_FLOAT_H_

Modified: branches/arwinss/reactos/include/ddk/winddk.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/win…
==============================================================================
--- branches/arwinss/reactos/include/ddk/winddk.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/ddk/winddk.h [iso-8859-1] Wed Aug 12 22:45:35 2009
@@ -10277,6 +10277,7 @@
   IN PCCH  Format,
   IN ...);
 
+NTSYSAPI
 ULONG
 DDKCDECLAPI
 DbgPrintEx(

Modified: branches/arwinss/reactos/include/dxsdk/ddraw.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/dxsdk/d…
==============================================================================
--- branches/arwinss/reactos/include/dxsdk/ddraw.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/dxsdk/ddraw.h [iso-8859-1] Wed Aug 12 22:45:35 2009
@@ -8,8 +8,8 @@
 #include <objbase.h>
 #else
 #define IUnknown void
-#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT)
-        #define CO_E_NOTINITIALIZED 0x800401F0
+#if !defined(NT_BUILD_ENVIRONMENT) && !defined(_WINNT_H)
+        #define CO_E_NOTINITIALIZED 0x800401F0L
 #endif
 #endif
 

Modified: branches/arwinss/reactos/include/reactos/debug.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos…
==============================================================================
--- branches/arwinss/reactos/include/reactos/debug.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/reactos/debug.h [iso-8859-1] Wed Aug 12 22:45:35
2009
@@ -31,6 +31,7 @@
     IN ...
 );
 
+NTSYSAPI
 ULONG
 __cdecl
 DbgPrintEx(

Modified: branches/arwinss/reactos/include/reactos/probe.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos…
==============================================================================
--- branches/arwinss/reactos/include/reactos/probe.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/reactos/probe.h [iso-8859-1] Wed Aug 12 22:45:35
2009
@@ -12,14 +12,6 @@
 
 #if defined(_WIN32K_)
 static const LARGE_STRING __emptyLargeString = {0, 0, 0, NULL};
-#endif
-
-#if defined(_WIN32K_)
-/*
- * NOTE: NTOSKRNL unfortunately doesn't export RtlRaiseStatus!
- */
-VOID NTAPI W32kRaiseStatus(NTSTATUS Status);
-#define RtlRaiseStatus W32kRaiseStatus
 #endif
 
 /*
@@ -29,7 +21,7 @@
     do {                                                                       \
         if ((ULONG_PTR)(Ptr) + sizeof(Type) - 1 < (ULONG_PTR)(Ptr) ||          \
             (ULONG_PTR)(Ptr) + sizeof(Type) - 1 >= (ULONG_PTR)MmUserProbeAddress) { \
-            RtlRaiseStatus (STATUS_ACCESS_VIOLATION);                          \
+            ExRaiseAccessViolation();                                          \
         }                                                                      \
         *(volatile Type *)(Ptr) = *(volatile Type *)(Ptr);                     \
     } while (0)
@@ -60,7 +52,7 @@
 #define ProbeForReadGenericType(Ptr, Type, Default)                            \
     (((ULONG_PTR)(Ptr) + sizeof(Type) - 1 < (ULONG_PTR)(Ptr) ||                \
 	 (ULONG_PTR)(Ptr) + sizeof(Type) - 1 >= (ULONG_PTR)MmUserProbeAddress) ?   \
-	     ExRaiseStatus (STATUS_ACCESS_VIOLATION), Default :                    \
+	     ExRaiseAccessViolation(), Default :                     \
 	     *(const volatile Type *)(Ptr))
 
 #define ProbeForReadBoolean(Ptr) ProbeForReadGenericType(Ptr, BOOLEAN, FALSE)
@@ -90,7 +82,7 @@
     do {                                                                       \
         if ((ULONG_PTR)(Ptr) + sizeof(HANDLE) - 1 < (ULONG_PTR)(Ptr) ||        \
             (ULONG_PTR)(Ptr) + sizeof(HANDLE) - 1 >= (ULONG_PTR)MmUserProbeAddress) {
\
-            RtlRaiseStatus (STATUS_ACCESS_VIOLATION);                          \
+            ExRaiseAccessViolation();                                          \
         }                                                                      \
         *(volatile HANDLE *)(Ptr) = NULL;                                      \
     } while (0)
@@ -113,7 +105,7 @@
     ArraySize = ItemSize * ItemCount;
     if (ArraySize / ItemSize != ItemCount)
     {
-        RtlRaiseStatus (STATUS_INVALID_PARAMETER);
+        ExRaiseStatus(STATUS_INVALID_PARAMETER);
     }
 
     /* Probe the array */
@@ -135,7 +127,7 @@
     ArraySize = ItemSize * ItemCount;
     if (ArraySize / ItemSize != ItemCount)
     {
-        RtlRaiseStatus (STATUS_INVALID_PARAMETER);
+        ExRaiseStatus(STATUS_INVALID_PARAMETER);
     }
 
     /* Probe the array */

Modified: branches/arwinss/reactos/include/reactos/win32k/rosuser.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos…
==============================================================================
--- branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] Wed Aug 12
22:45:35 2009
@@ -134,6 +134,6 @@
 RosUserGetAsyncKeyboardState(BYTE key_state_table[]);
 
 VOID NTAPI
-RosUserConnectCsrss();
+RosUserConnectCsrss(VOID);
 
 #endif /* __WIN32K_NTUSER_H */

Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engfile.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/eng/engfile.c [iso-8859-1]
(original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engfile.c [iso-8859-1] Wed Aug 12
22:45:35 2009
@@ -110,8 +110,9 @@
             DPRINT1("ZwSetSystemInformation failed with Status 0x%lx\n",
Status);
         }
         else {
+            PDRIVERS DriverInfo;
             hImageHandle = (HANDLE)GdiDriverInfo.ImageAddress;
-            PDRIVERS DriverInfo = ExAllocatePool(PagedPool, sizeof(DRIVERS));
+            DriverInfo = ExAllocatePool(PagedPool, sizeof(DRIVERS));
             DriverInfo->DriverName.MaximumLength =
GdiDriverInfo.DriverName.MaximumLength;
             DriverInfo->DriverName.Length = GdiDriverInfo.DriverName.Length;
             DriverInfo->DriverName.Buffer = ExAllocatePool(PagedPool,
GdiDriverInfo.DriverName.MaximumLength);

Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engrtl.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/eng/engrtl.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engrtl.c [iso-8859-1] Wed Aug 12
22:45:35 2009
@@ -20,7 +20,7 @@
                       OUT PUSHORT AnsiCodePage)
 {
     /* Call Rtl */
-    return RtlGetDefaultCodePage(AnsiCodePage, OemCodePage);
+    RtlGetDefaultCodePage(AnsiCodePage, OemCodePage);
 }
 
 VOID

Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/gre/gdiobj.c [iso-8859-1] Wed Aug 12
22:45:35 2009
@@ -349,6 +349,9 @@
     PBASEOBJECT  newObject = NULL;
     HANDLE CurrentProcessId, LockedProcessId;
     UCHAR TypeIndex;
+    UINT Index;
+    PGDI_TABLE_ENTRY Entry;
+    LONG TypeInfo;
 
     GDIDBG_INITLOOPTRACE();
 
@@ -372,10 +375,6 @@
         DPRINT1("Not enough memory to allocate gdi object!\n");
         return NULL;
     }
-
-    UINT Index;
-    PGDI_TABLE_ENTRY Entry;
-    LONG TypeInfo;
 
     CurrentProcessId = PsGetCurrentProcessId();
     LockedProcessId = (HANDLE)((ULONG_PTR)CurrentProcessId | 0x1);

Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1]
(original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] Wed Aug
12 22:45:35 2009
@@ -28,6 +28,7 @@
 #include <windef.h>
 #include <winerror.h>
 #include <wingdi.h>
+#define NT_BUILD_ENVIRONMENT
 #include <winddi.h>
 #include <winuser.h>
 #include <prntfont.h>

Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h [iso-8859-1]
(original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h [iso-8859-1] Wed
Aug 12 22:45:35 2009
@@ -141,11 +141,11 @@
 // fd stuff
 struct wait_queue_entry;
 
-struct fd {};
+struct fd {int a;};
 
-struct event {};
+struct event {int a;};
 
-struct async_queue {};
+struct async_queue {int a;};
 
 unsigned int default_fd_map_access( struct object *obj, unsigned int access );
 void set_fd_events( struct fd *fd, int events );

Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/err.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/main/err.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/main/err.c [iso-8859-1] Wed Aug 12
22:45:35 2009
@@ -61,22 +61,4 @@
   return 0;
 }
 
-VOID
-APIENTRY
-W32kRaiseStatus(NTSTATUS Status)
-{
-    EXCEPTION_RECORD ExceptionRecord;
-
-    /* Create an exception record */
-    ExceptionRecord.ExceptionCode  = Status;
-    ExceptionRecord.ExceptionRecord = NULL;
-    ExceptionRecord.NumberParameters = 0;
-    ExceptionRecord.ExceptionFlags = EXCEPTION_NONCONTINUABLE;
-
-    RtlRaiseException(&ExceptionRecord);
-
-    /* If we returned, raise a status */
-    W32kRaiseStatus(Status);
-}
-
 /* EOF */

Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] Wed Aug 12
22:45:35 2009
@@ -1154,9 +1154,10 @@
 static struct timer *set_timer( struct msg_queue *queue, unsigned int rate )
 {
     LARGE_INTEGER current_time;
+    struct timer *timer;
     KeQuerySystemTime(&current_time);
 
-    struct timer *timer = mem_alloc( sizeof(*timer) );
+    timer = mem_alloc( sizeof(*timer) );
     if (timer)
     {
         timer->rate = max( rate, 1 );