Fix win32k warnings, get rid of windowsx.h dependency

Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c
Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c
Modified: trunk/reactos/subsys/win32k/w32k.h

--- trunk/reactos/subsys/win32k/ntuser/msgqueue.c	2005-06-30 16:04:08 UTC (rev 16347)
+++ trunk/reactos/subsys/win32k/ntuser/msgqueue.c	2005-06-30 16:17:45 UTC (rev 16348)
@@ -526,8 +526,8 @@

         {
           MSLLHOOKSTRUCT MouseHookData;
 

-          MouseHookData.pt.x = GET_X_LPARAM(Msg.lParam); 
-          MouseHookData.pt.y = GET_Y_LPARAM(Msg.lParam); 

+          MouseHookData.pt.x = LOWORD(Msg.lParam); 
+          MouseHookData.pt.y = HIWORD(Msg.lParam); 

           switch(Msg.message)
             {
               case WM_MOUSEWHEEL:

--- trunk/reactos/subsys/win32k/objects/gdiobj.c	2005-06-30 16:04:08 UTC (rev 16347)
+++ trunk/reactos/subsys/win32k/objects/gdiobj.c	2005-06-30 16:17:45 UTC (rev 16348)
@@ -776,10 +776,10 @@

             }
             else
             {

-               InterlockedIncrement(&GdiHdr->Locks);

+               InterlockedIncrement((PLONG)&GdiHdr->Locks);

                if (GdiHdr->LockingThread != Thread)
                {

-                  InterlockedDecrement(&GdiHdr->Locks);

+                  InterlockedDecrement((PLONG)&GdiHdr->Locks);

 
                   /* Unlock the handle table entry. */
                   InterlockedExchangePointer(&HandleEntry->ProcessId, PrevProcId);
@@ -917,13 +917,13 @@

             PGDIOBJHDR GdiHdr = GDIBdyToHdr(HandleEntry->KernelData);
 
 #ifdef GDI_DEBUG

-            if (InterlockedIncrement(&GdiHdr->Locks) == 1)

+            if (InterlockedIncrement((PLONG)&GdiHdr->Locks) == 1)

             {
                GdiHdr->lockfile = file;
                GdiHdr->lockline = line;
             }
 #else

-            InterlockedIncrement(&GdiHdr->Locks);

+            InterlockedIncrement((PLONG)&GdiHdr->Locks);

 #endif
             Object = HandleEntry->KernelData;
          }
@@ -987,13 +987,13 @@

 {
    PGDIOBJHDR GdiHdr = GDIBdyToHdr(Object);
 #ifdef GDI_DEBUG

-   if (InterlockedDecrement(&GdiHdr->Locks) == 0)

+   if (InterlockedDecrement((PLONG)&GdiHdr->Locks) == 0)

    {
       GdiHdr->lockfile = NULL;
       GdiHdr->lockline = 0;
    }
 #else

-   InterlockedDecrement(&GdiHdr->Locks);

+   InterlockedDecrement((PLONG)&GdiHdr->Locks);

 #endif
 }
 

--- trunk/reactos/subsys/win32k/w32k.h	2005-06-30 16:04:08 UTC (rev 16347)
+++ trunk/reactos/subsys/win32k/w32k.h	2005-06-30 16:17:45 UTC (rev 16348)
@@ -17,12 +17,10 @@

 /* DDK/NDK/SDK Headers */
 #include <ddk/ntddk.h>
 #include <ddk/ntifs.h>

-#include <ddk/ddrawint.h>
-#include <ddk/d3dnthal.h>

 #include <ddk/winddi.h>
 #include <ddk/ntddmou.h>
 #include <windows.h>    /* FIXME ? */

-#include <windowsx.h>   /* FIXME ? */

+//#include <windowsx.h>   /* FIXME ? */

 #include <ndk/ntndk.h>
 
 /* FIXME: ReactOS will be R-Rated if I really write what I'm about to */