mirror of
https://github.com/reactos/reactos.git
synced 2024-08-21 10:53:15 +00:00
Reduce differences to trunk
svn path=/branches/ros-amd64-bringup/; revision=44962
This commit is contained in:
parent
4289213dc7
commit
74f902bf27
|
@ -1709,7 +1709,7 @@ NtUserGetClassName(HWND hWnd,
|
|||
PUNICODE_STRING ClassName);
|
||||
#endif
|
||||
|
||||
DWORD_PTR
|
||||
HANDLE
|
||||
NTAPI
|
||||
NtUserGetClipboardData(
|
||||
UINT uFormat,
|
||||
|
@ -2881,7 +2881,7 @@ BOOL
|
|||
NTAPI
|
||||
NtUserTranslateMessage(
|
||||
LPMSG lpMsg,
|
||||
UINT Flags );
|
||||
HKL dwhkl );
|
||||
|
||||
BOOL
|
||||
NTAPI
|
||||
|
|
|
@ -77,8 +77,7 @@ CsrGetObject(
|
|||
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 @@ CsrReleaseObject(
|
|||
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 @@ CsrInsertObject(
|
|||
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 @@ CsrVerifyObject(
|
|||
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)
|
||||
|
|
|
@ -188,7 +188,7 @@ co_IntSendMessageTimeout(HWND hWnd,
|
|||
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);
|
||||
|
|
|
@ -258,7 +258,7 @@ EngUnloadImage ( IN HANDLE hModule )
|
|||
ExFreePool(DriverInfo->DriverName.Buffer);
|
||||
RemoveEntryList(&DriverInfo->ListEntry);
|
||||
ExFreePool(DriverInfo);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* EOF */
|
||||
|
|
|
@ -640,7 +640,7 @@ co_IntCallEventProc(HWINEVENTHOOK hook,
|
|||
UserEnterCo();
|
||||
|
||||
IntCbFreeMemory(Argument);
|
||||
|
||||
|
||||
if (!NT_SUCCESS(Status))
|
||||
{
|
||||
return 0;
|
||||
|
@ -700,7 +700,7 @@ co_IntCallLoadMenu( HINSTANCE hModule,
|
|||
Result = *(LRESULT*)ResultPointer;
|
||||
|
||||
IntCbFreeMemory(Argument);
|
||||
|
||||
|
||||
if (!NT_SUCCESS(Status))
|
||||
{
|
||||
return 0;
|
||||
|
|
|
@ -551,7 +551,7 @@ IntGetClassForDesktop(IN OUT PCLS BaseClass,
|
|||
Class->pclsClone = NULL;
|
||||
Class->pclsBase = BaseClass;
|
||||
Class->pclsNext = BaseClass->pclsClone;
|
||||
(void)InterlockedExchangePointer((VOID*)&BaseClass->pclsClone,
|
||||
(void)InterlockedExchangePointer((PVOID*)&BaseClass->pclsClone,
|
||||
Class);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -581,10 +581,10 @@ NtUserEmptyClipboard(VOID)
|
|||
return ret;
|
||||
}
|
||||
|
||||
DWORD_PTR APIENTRY
|
||||
HANDLE APIENTRY
|
||||
NtUserGetClipboardData(UINT uFormat, PVOID pBuffer)
|
||||
{
|
||||
DWORD_PTR ret = 0;
|
||||
HANDLE ret = NULL;
|
||||
|
||||
UserEnterShared();
|
||||
|
||||
|
@ -607,7 +607,7 @@ NtUserGetClipboardData(UINT uFormat, PVOID pBuffer)
|
|||
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 @@ NtUserGetClipboardData(UINT uFormat, PVOID pBuffer)
|
|||
}
|
||||
|
||||
}
|
||||
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 @@ NtUserGetClipboardData(UINT uFormat, PVOID pBuffer)
|
|||
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 @@ NtUserGetClipboardData(UINT uFormat, PVOID pBuffer)
|
|||
}
|
||||
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
|
||||
{
|
||||
ret = 0;
|
||||
ret = NULL;
|
||||
}
|
||||
_SEH2_END
|
||||
|
||||
|
@ -669,7 +669,7 @@ NtUserGetClipboardData(UINT uFormat, PVOID pBuffer)
|
|||
}
|
||||
else
|
||||
{
|
||||
ret = (DWORD_PTR)pBuffer;
|
||||
ret = (HANDLE)pBuffer;
|
||||
|
||||
_SEH2_TRY
|
||||
{
|
||||
|
@ -678,7 +678,7 @@ NtUserGetClipboardData(UINT uFormat, PVOID pBuffer)
|
|||
}
|
||||
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
|
||||
{
|
||||
ret = 0;
|
||||
ret = NULL;
|
||||
}
|
||||
_SEH2_END
|
||||
}
|
||||
|
|
|
@ -298,7 +298,7 @@ IntCallLowLevelHook(PHOOK Hook, INT Code, WPARAM wParam, LPARAM lParam)
|
|||
/* 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,
|
||||
|
|
|
@ -419,7 +419,7 @@ CLEANUP:
|
|||
|
||||
BOOL FASTCALL
|
||||
IntTranslateKbdMessage(LPMSG lpMsg,
|
||||
UINT Flags)
|
||||
HKL dwhkl)
|
||||
{
|
||||
PTHREADINFO pti;
|
||||
static INT dead_char = 0;
|
||||
|
|
|
@ -2195,7 +2195,7 @@ NtUserDispatchMessage(PMSG UnsafeMsgInfo)
|
|||
|
||||
BOOL APIENTRY
|
||||
NtUserTranslateMessage(LPMSG lpMsg,
|
||||
UINT flags)
|
||||
HKL dwhkl)
|
||||
{
|
||||
NTSTATUS Status;
|
||||
MSG SafeMsg;
|
||||
|
@ -2211,7 +2211,7 @@ NtUserTranslateMessage(LPMSG lpMsg,
|
|||
RETURN( FALSE);
|
||||
}
|
||||
|
||||
RETURN( IntTranslateKbdMessage(&SafeMsg, flags));
|
||||
RETURN( IntTranslateKbdMessage(&SafeMsg, dwhkl));
|
||||
|
||||
CLEANUP:
|
||||
DPRINT("Leave NtUserTranslateMessage: ret=%i\n",_ret_);
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
#include "include/reactos/msvctarget.h"
|
||||
#undef i386
|
||||
|
||||
@ stdcall -arch=i386 FLOATOBJ_AddFloatObj(ptr ptr) FLOATOBJ_Add
|
||||
|
|
Loading…
Reference in a new issue