Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix win32k warnings, get rid of windowsx.h dependency

Browse source 
svn path=/trunk/; revision=16348
This commit is contained in:
Alex Ionescu 2005-06-30 16:17:45 +00:00
parent d280ce9240
commit 02bd986e69
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/subsys/win32k/ntuser/msgqueue.c
View file

@ -526,8 +526,8 @@ MsqPeekHardwareMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND hWnd,
{
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:

12
reactos/subsys/win32k/objects/gdiobj.c
View file

@ -776,10 +776,10 @@ GDIOBJ_LockObj (HGDIOBJ hObj, DWORD ObjectType)
}
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 @@ GDIOBJ_ShareLockObj (HGDIOBJ hObj, DWORD ObjectType)
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 @@ GDIOBJ_UnlockObjByPtr(PGDIOBJ Object)
{
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
}

4
reactos/subsys/win32k/w32k.h
View file

@ -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 */