Author: jimtabor Date: Tue Jul 7 00:56:17 2009 New Revision: 41789
URL: http://svn.reactos.org/svn/reactos?rev=41789&view=rev Log: - Update UpdateLayeredWindow and Indirect.
Modified: trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db
Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/me... ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Tue Jul 7 00:56:17 2009 @@ -1654,7 +1654,7 @@ { return FALSE; } - Result = NtUserPostMessage( KMMsg.hwnd, + Result = NtUserPostMessage( Wnd, KMMsg.message, KMMsg.wParam, KMMsg.lParam);
Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/wi... ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Tue Jul 7 00:56:17 2009 @@ -1608,14 +1608,55 @@
/* - * @unimplemented + * @implemented + */ +BOOL WINAPI +UpdateLayeredWindow( HWND hwnd, + HDC hdcDst, + POINT *pptDst, + SIZE *psize, + HDC hdcSrc, + POINT *pptSrc, + COLORREF crKey, + BLENDFUNCTION *pbl, + DWORD dwFlags) +{ + if ( dwFlags & ULW_EX_NORESIZE) + dwFlags = ~(ULW_EX_NORESIZE|ULW_OPAQUE|ULW_ALPHA|ULW_COLORKEY); + return NtUserUpdateLayeredWindow( hwnd, + hdcDst, + pptDst, + psize, + hdcSrc, + pptSrc, + crKey, + pbl, + dwFlags, + NULL); +} + +/* + * @implemented */ BOOL WINAPI UpdateLayeredWindowIndirect(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info) { - UNIMPLEMENTED; - return FALSE; + if (info && info->cbSize == sizeof(info)) + { + return NtUserUpdateLayeredWindow( hwnd, + info->hdcDst, + (POINT *)info->pptDst, + (SIZE *)info->psize, + info->hdcSrc, + (POINT *)info->pptSrc, + info->crKey, + (BLENDFUNCTION *)info->pblend, + info->dwFlags, + (RECT *)info->prcDirty); + } + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; }
Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntus... ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Jul 7 00:56:17 2009 @@ -2744,7 +2744,8 @@ POINT *pptSrc, COLORREF crKey, BLENDFUNCTION *pblend, - DWORD dwFlags); + DWORD dwFlags, + RECT *prcDirty);
BOOL NTAPI
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Jul 7 00:56:17 2009 @@ -4653,7 +4653,8 @@ POINT *pptSrc, COLORREF crKey, BLENDFUNCTION *pblend, - DWORD dwFlags) + DWORD dwFlags, + RECT *prcDirty) { UNIMPLEMENTED
Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w32... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Tue Jul 7 00:56:17 2009 @@ -583,7 +583,7 @@ NtUserUnregisterHotKey 2 NtUserUpdateInputContext 3 NtUserUpdateInstance 3 -NtUserUpdateLayeredWindow 9 +NtUserUpdateLayeredWindow 10 NtUserGetLayeredWindowAttributes 4 NtUserSetLayeredWindowAttributes 4 NtUserUpdatePerUserSystemParameters 2