Author: pborobia Date: Thu Aug 31 21:37:49 2006 New Revision: 23847
URL: http://svn.reactos.org/svn/reactos?rev=23847&view=rev Log: * add more clipboard formats definitions * move definition to right place
Modified: branches/clipboard/include/psdk/winuser.h branches/clipboard/subsystems/win32/win32k/ntuser/clipboard.c
Modified: branches/clipboard/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/clipboard/include/psdk/winuser.h... ============================================================================== --- branches/clipboard/include/psdk/winuser.h (original) +++ branches/clipboard/include/psdk/winuser.h Thu Aug 31 21:37:49 2006 @@ -54,6 +54,8 @@ #define HCBT_KEYSKIPPED 7 #define HCBT_SYSCOMMAND 8 #define HCBT_SETFOCUS 9 + +/* Predefined Clipboard Formats */ #define CF_TEXT 1 #define CF_BITMAP 2 #define CF_METAFILEPICT 3 @@ -68,9 +70,24 @@ #define CF_WAVE 12 #define CF_UNICODETEXT 13 #define CF_ENHMETAFILE 14 -#define CF_HDROP 15 -#define CF_LOCALE 16 -#define CF_MAX 17 + +#if(WINVER >= 0x0400) +#define CF_HDROP 15 +#define CF_LOCALE 16 +#endif + +#if(WINVER >= 0x0500) +#define CF_DIBV5 17 +#endif + +#if(WINVER >= 0x0500) +#define CF_MAX 18 +#elif(WINVER >= 0x0400) +#define CF_MAX 17 +#else +#define CF_MAX 15 +#endif + #define CF_OWNERDISPLAY 128 #define CF_DSPTEXT 129 #define CF_DSPBITMAP 130 @@ -80,6 +97,7 @@ #define CF_PRIVATELAST 767 #define CF_GDIOBJFIRST 768 #define CF_GDIOBJLAST 1023 + #define HKL_NEXT 1 #define HKL_PREV 0 #define KLF_ACTIVATE 1
Modified: branches/clipboard/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/clipboard/subsystems/win32/win32... ============================================================================== --- branches/clipboard/subsystems/win32/win32k/ntuser/clipboard.c (original) +++ branches/clipboard/subsystems/win32/win32k/ntuser/clipboard.c Thu Aug 31 21:37:49 2006 @@ -11,8 +11,6 @@
#define DEBUG #include <debug.h> - -#define CF_DIBV5 17
#define DATA_DELAYED_RENDER 0 #define DATA_SYNTHESIZED_RENDER -1