[ros-diffs] [jimtabor] 36398: - Add UPDATELAYEREDWINDOWINFO structure and UpdateLayeredWindowIndirect and types to psdk. - Move UpdateLayeredWindow to def and change it to UpdateLayeredWindowIndirect.

Author: jimtabor
Date: Sun Sep 21 19:52:24 2008
New Revision: 36398

URL: http://svn.reactos.org/svn/reactos?rev=36398&view=rev
Log:
- Add UPDATELAYEREDWINDOWINFO structure and UpdateLayeredWindowIndirect and types to
psdk.
- Move UpdateLayeredWindow to def and change it to UpdateLayeredWindowIndirect.

Modified:
    trunk/reactos/dll/win32/user32/user32.def
    trunk/reactos/dll/win32/user32/windows/window.c
    trunk/reactos/include/psdk/winuser.h

Modified: trunk/reactos/dll/win32/user32/user32.def
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.de…
==============================================================================
--- trunk/reactos/dll/win32/user32/user32.def [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/user32.def [iso-8859-1] Sun Sep 21 19:52:24 2008
@@ -704,7 +704,7 @@
 UnregisterHotKey@8=NtUserUnregisterHotKey@8
 UnregisterMessagePumpHook@0
 UnregisterUserApiHook@0
-UpdateLayeredWindow@36
+UpdateLayeredWindow@36=NtUserUpdateLayeredWindow@36
 UpdatePerUserSystemParameters@8
 UpdateWindow@4
 User32InitializeImmEntryTable@4

Modified: trunk/reactos/dll/win32/user32/windows/window.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Sun Sep 21 19:52:24 2008
@@ -1762,15 +1762,8 @@
  * @unimplemented
  */
 BOOL STDCALL
-UpdateLayeredWindow(HWND hwnd,
-                    HDC hdcDst,
-                    POINT *pptDst,
-                    SIZE *psize,
-                    HDC hdcSrc,
-                    POINT *pptSrc,
-                    COLORREF crKey,
-                    BLENDFUNCTION *pblend,
-                    DWORD dwFlags)
+UpdateLayeredWindowIndirect(HWND hwnd,
+                            const UPDATELAYEREDWINDOWINFO *info)
 {
     UNIMPLEMENTED;
     return FALSE;

Modified: trunk/reactos/include/psdk/winuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sun Sep 21 19:52:24 2008
@@ -2594,6 +2594,10 @@
 #define LWA_COLORKEY 1
 #define LWA_ALPHA 2
 #endif
+#define ULW_COLORKEY        0x00000001
+#define ULW_ALPHA           0x00000002
+#define ULW_OPAQUE          0x00000004
+#define ULW_EX_NORESIZE     0x00000008
 #define GA_PARENT 1
 #define GA_ROOT 2
 #define GA_ROOTOWNER 3
@@ -4279,6 +4283,20 @@
 BOOL WINAPI SetLayeredWindowAttributes(HWND,COLORREF,BYTE,DWORD);
 #if defined(_WINGDI_) && !defined(NOGDI)
 BOOL WINAPI
UpdateLayeredWindow(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD);
+typedef struct tagUPDATELAYEREDWINDOWINFO
+{
+    DWORD                cbSize;
+    HDC                  hdcDst;
+    POINT CONST*         pptDst;
+    SIZE CONST*          psize;
+    HDC                  hdcSrc;
+    POINT CONST*         pptSrc;
+    COLORREF             crKey;
+    BLENDFUNCTION CONST* pblend;
+    DWORD                dwFlags;
+    RECT CONST*          prcDirty;
+} UPDATELAYEREDWINDOWINFO, *PUPDATELAYEREDWINDOWINFO;
+BOOL WINAPI UpdateLayeredWindowIndirect(HWND,UPDATELAYEREDWINDOWINFO CONST*);
 #endif
 #endif
 #if (_WIN32_WINNT >= 0x0501)