Author: tkreuzer
Date: Tue Jan 5 21:42:07 2010
New Revision: 44962
URL: http://svn.reactos.org/svn/reactos?rev=44962&view=rev
Log:
Reduce differences to trunk
Modified:
branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h
branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/msgqueue.h
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ldr/loader.c
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/callback.c
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/class.c
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/clipboard.c
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/keyboard.c
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.pspec
Modified: branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h?rev=44962&r1=44961&r2=44962&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h
[iso-8859-1] Tue Jan 5 21:42:07 2010
@@ -1709,7 +1709,7 @@
PUNICODE_STRING ClassName);
#endif
-DWORD_PTR
+HANDLE
NTAPI
NtUserGetClipboardData(
UINT uFormat,
@@ -2881,7 +2881,7 @@
NTAPI
NtUserTranslateMessage(
LPMSG lpMsg,
- UINT Flags );
+ HKL dwhkl );
BOOL
NTAPI
Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c?rev=44962&r1=44961&r2=44962&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/api/handle.c
[iso-8859-1] Tue Jan 5 21:42:07 2010
@@ -77,8 +77,7 @@
Object_t **Object,
DWORD Access )
{
- ULONG_PTR h = (ULONG_PTR)Handle >> 2;
- DPRINT("CsrGetObject, Object: %x, %x, %x\n", Object, Handle, ProcessData ?
ProcessData->HandleTableSize : 0);
+ ULONG_PTR h = (ULONG_PTR)Handle >> 2;
DPRINT("CsrGetObject, Object: %x, %x, %x\n",
Object, Handle, ProcessData ? ProcessData->HandleTableSize : 0);
@@ -131,8 +130,8 @@
PCSRSS_PROCESS_DATA ProcessData,
HANDLE Handle)
{
- ULONG_PTR h = (ULONG_PTR)Handle >> 2;
- Object_t *Object;
+ ULONG_PTR h = (ULONG_PTR)Handle >> 2;
+ Object_t *Object;
RtlEnterCriticalSection(&ProcessData->HandleTableLock);
if (h >= ProcessData->HandleTableSize
@@ -188,7 +187,7 @@
ProcessData->HandleTable[i].Object = Object;
ProcessData->HandleTable[i].Access = Access;
ProcessData->HandleTable[i].Inheritable = Inheritable;
- *Handle = ULongToHandle(((i << 2) | 0x3));
+ *Handle = UlongToHandle((i << 2) | 0x3);
_InterlockedIncrement( &Object->ReferenceCount );
RtlLeaveCriticalSection(&ProcessData->HandleTableLock);
return(STATUS_SUCCESS);
@@ -240,7 +239,7 @@
PCSRSS_PROCESS_DATA ProcessData,
HANDLE Handle)
{
- ULONG_PTR h = (ULONG_PTR)Handle >> 2;
+ ULONG_PTR h = (ULONG_PTR)Handle >> 2;
if (h >= ProcessData->HandleTableSize ||
ProcessData->HandleTable[h].Object == NULL)
Modified:
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/msgqueue.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/msgqueue.h?rev=44962&r1=44961&r2=44962&view=diff
==============================================================================
---
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/msgqueue.h
[iso-8859-1] (original)
+++
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/msgqueue.h
[iso-8859-1] Tue Jan 5 21:42:07 2010
@@ -188,7 +188,7 @@
LRESULT FASTCALL
IntDispatchMessage(MSG* Msg);
BOOL FASTCALL
-IntTranslateKbdMessage(LPMSG lpMsg, UINT flags);
+IntTranslateKbdMessage(LPMSG lpMsg, HKL dwhkl);
VOID FASTCALL
co_MsqPostKeyboardMessage(UINT uMsg, WPARAM wParam, LPARAM lParam);
Modified:
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ldr/loader.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ldr/loader.c?rev=44962&r1=44961&r2=44962&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ldr/loader.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ldr/loader.c
[iso-8859-1] Tue Jan 5 21:42:07 2010
@@ -258,7 +258,7 @@
ExFreePool(DriverInfo->DriverName.Buffer);
RemoveEntryList(&DriverInfo->ListEntry);
ExFreePool(DriverInfo);
- }
- }
+ }
+}
/* EOF */
Modified:
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/callback.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/callback.c?rev=44962&r1=44961&r2=44962&view=diff
==============================================================================
---
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/callback.c
[iso-8859-1] (original)
+++
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/callback.c
[iso-8859-1] Tue Jan 5 21:42:07 2010
@@ -640,7 +640,7 @@
UserEnterCo();
IntCbFreeMemory(Argument);
-
+
if (!NT_SUCCESS(Status))
{
return 0;
@@ -700,7 +700,7 @@
Result = *(LRESULT*)ResultPointer;
IntCbFreeMemory(Argument);
-
+
if (!NT_SUCCESS(Status))
{
return 0;
Modified:
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/class.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/class.c?rev=44962&r1=44961&r2=44962&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/class.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/class.c
[iso-8859-1] Tue Jan 5 21:42:07 2010
@@ -551,7 +551,7 @@
Class->pclsClone = NULL;
Class->pclsBase = BaseClass;
Class->pclsNext = BaseClass->pclsClone;
- (void)InterlockedExchangePointer((VOID*)&BaseClass->pclsClone,
+ (void)InterlockedExchangePointer((PVOID*)&BaseClass->pclsClone,
Class);
}
}
Modified:
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/clipboard.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/clipboard.c?rev=44962&r1=44961&r2=44962&view=diff
==============================================================================
---
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/clipboard.c
[iso-8859-1] (original)
+++
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/clipboard.c
[iso-8859-1] Tue Jan 5 21:42:07 2010
@@ -581,10 +581,10 @@
return ret;
}
-DWORD_PTR APIENTRY
+HANDLE APIENTRY
NtUserGetClipboardData(UINT uFormat, PVOID pBuffer)
{
- DWORD_PTR ret = 0;
+ HANDLE ret = NULL;
UserEnterShared();
@@ -607,7 +607,7 @@
co_IntSendMessage(ClipboardOwnerWindow->hSelf,
WM_RENDERFORMAT, (WPARAM)uFormat, 0);
data = intIsFormatAvailable(uFormat);
ASSERT(data->size);
- ret = data->size;
+ ret = (HANDLE)(ULONG_PTR)data->size;
}
}
else
@@ -618,12 +618,12 @@
}
}
- ret = data->size;
+ ret = (HANDLE)(ULONG_PTR)data->size;
}
else
{
/* there is no data in this format */
- //ret = FALSE;
+ //ret = (HANDLE)FALSE;
}
}
else
@@ -646,12 +646,12 @@
PCLIPBOARDELEMENT data =
intIsFormatAvailable(CF_DIB);
if (data)
{
- ret =
(DWORD_PTR)renderBITMAPfromDIB(data->hData);
+ ret = renderBITMAPfromDIB(data->hData);
}
}
else
{
- ret = (DWORD_PTR)pBuffer;
+ ret = (HANDLE)pBuffer;
_SEH2_TRY
{
@@ -660,7 +660,7 @@
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
- ret = 0;
+ ret = NULL;
}
_SEH2_END
@@ -669,7 +669,7 @@
}
else
{
- ret = (DWORD_PTR)pBuffer;
+ ret = (HANDLE)pBuffer;
_SEH2_TRY
{
@@ -678,7 +678,7 @@
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
- ret = 0;
+ ret = NULL;
}
_SEH2_END
}
Modified:
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c?rev=44962&r1=44961&r2=44962&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c
[iso-8859-1] Tue Jan 5 21:42:07 2010
@@ -298,7 +298,7 @@
/* FIXME should get timeout from
* HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */
Status =
co_MsqSendMessage(((PTHREADINFO)Hook->Thread->Tcb.Win32Thread)->MessageQueue,
- (HWND)(UINT_PTR)Code,
+ IntToPtr(Code),
Hook->HookId,
wParam,
lParam,
Modified:
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/keyboard.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/keyboard.c?rev=44962&r1=44961&r2=44962&view=diff
==============================================================================
---
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/keyboard.c
[iso-8859-1] (original)
+++
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/keyboard.c
[iso-8859-1] Tue Jan 5 21:42:07 2010
@@ -419,7 +419,7 @@
BOOL FASTCALL
IntTranslateKbdMessage(LPMSG lpMsg,
- UINT Flags)
+ HKL dwhkl)
{
PTHREADINFO pti;
static INT dead_char = 0;
Modified:
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c?rev=44962&r1=44961&r2=44962&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c
[iso-8859-1] Tue Jan 5 21:42:07 2010
@@ -2195,7 +2195,7 @@
BOOL APIENTRY
NtUserTranslateMessage(LPMSG lpMsg,
- UINT flags)
+ HKL dwhkl)
{
NTSTATUS Status;
MSG SafeMsg;
@@ -2211,7 +2211,7 @@
RETURN( FALSE);
}
- RETURN( IntTranslateKbdMessage(&SafeMsg, flags));
+ RETURN( IntTranslateKbdMessage(&SafeMsg, dwhkl));
CLEANUP:
DPRINT("Leave NtUserTranslateMessage: ret=%i\n",_ret_);
Modified:
branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.pspec
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.pspec?rev=44962&r1=44961&r2=44962&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.pspec
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/win32k.pspec
[iso-8859-1] Tue Jan 5 21:42:07 2010
@@ -1,3 +1,4 @@
+#include "include/reactos/msvctarget.h"
#undef i386
@ stdcall -arch=i386 FLOATOBJ_AddFloatObj(ptr ptr) FLOATOBJ_Add
