[ros-diffs] [akhaldi] 69757: [PSDK] Comment commctrl.h preprocessor conditions in an attempt to make this maze readable.

Author: akhaldi
Date: Sat Oct 31 18:37:34 2015
New Revision: 69757

URL: http://svn.reactos.org/svn/reactos?rev=69757&view=rev
Log:
[PSDK] Comment commctrl.h preprocessor conditions in an attempt to make this maze readable.

Modified:
    trunk/reactos/include/psdk/commctrl.h

Modified: trunk/reactos/include/psdk/commctrl.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?rev...
==============================================================================
--- trunk/reactos/include/psdk/commctrl.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/commctrl.h	[iso-8859-1] Sat Oct 31 18:37:34 2015
@@ -17,8 +17,8 @@
 #if (_WIN32_IE < 0x0500)
 #error _WIN32_IE setting conflicts
 #endif
-#endif
-#endif
+#endif /* !_WIN32_IE */
+#endif /* !_WINRESRC_ */

#ifndef _HRESULT_DEFINED
 #define _HRESULT_DEFINED
@@ -26,13 +26,14 @@
 #endif

#ifndef NOUSER
+
 #ifndef WINCOMMCTRLAPI
 #ifndef _COMCTL32_
 #define WINCOMMCTRLAPI DECLSPEC_IMPORT
 #else
 #define WINCOMMCTRLAPI
 #endif
-#endif
+#endif /* !WINCOMMCTRLAPI */

#ifdef __cplusplus
 extern "C" {
@@ -46,7 +47,7 @@
 #else
 #define SNDMSG SendMessage
 #endif
-#endif
+#endif /* !SNDMSG */

WINCOMMCTRLAPI void WINAPI InitCommonControls(void);

@@ -103,6 +104,7 @@
   } COLORSCHEME,*LPCOLORSCHEME;

#if (_WIN32_IE >= 0x0500)
+
 #if (_WIN32_WINNT >= 0x0501)
 #define COMCTL32_VERSION  6
 #else
@@ -116,7 +118,8 @@
 #define CCM_SETWINDOWTHEME (CCM_FIRST+0xb)
 #define CCM_DPISCALE (CCM_FIRST+0xc)
 #endif
-#endif
+
+#endif /* _WIN32_IE >= 0x0500 */

#define INFOTIPSIZE 1024

@@ -596,7 +599,7 @@

WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Duplicate(_In_ HIMAGELIST himl);

-#endif
+#endif /* !NOIMAGEAPIS */

#ifndef NOHEADER

@@ -900,7 +903,8 @@
     INT iItem;
     RECT rc;
   } NMHDFILTERBTNCLICK,*LPNMHDFILTERBTNCLICK;
-#endif
+
+#endif /* !NOHEADER */

#ifndef NOTOOLBAR

@@ -1417,7 +1421,7 @@
 #define NMTOOLBAR __MINGW_NAME_AW(NMTOOLBAR)
 #define LPNMTOOLBAR __MINGW_NAME_AW(LPNMTOOLBAR)

-#endif
+#endif /* !NOTOOLBAR */

#ifndef NOREBAR

@@ -1660,7 +1664,8 @@
     UINT flags;
     int iBand;
   } RBHITTESTINFO,*LPRBHITTESTINFO;
-#endif
+
+#endif /* !NOREBAR */

#ifndef NOTOOLTIPS

@@ -1875,7 +1880,8 @@
 #define LPNMTTDISPINFO __MINGW_NAME_AW(LPNMTTDISPINFO)

#define NMTTDISPINFO_V1_SIZE __MINGW_NAME_AW_EXT(NMTTDISPINFO,_V1_SIZE)
-#endif
+
+#endif /* !NOTOOLTIPS */

#ifndef NOSTATUSBAR

@@ -1937,7 +1943,8 @@
 #define SBN_SIMPLEMODECHANGE (SBN_FIRST - 0)

#define SB_SIMPLEID 0xff
-#endif
+
+#endif /* !NOSTATUSBAR */

#ifndef NOMENUHELP

@@ -1960,7 +1967,8 @@
     _In_z_ const INT *lpInfo);

#define MINSYSCOMMAND SC_SIZE
-#endif
+
+#endif /* !NOMENUHELP */

#ifndef NOTRACKBAR

@@ -2040,7 +2048,8 @@
 #define TBCD_TICS 0x1
 #define TBCD_THUMB 0x2
 #define TBCD_CHANNEL 0x3
-#endif
+
+#endif /* !NOTRACKBAR */

#ifndef NODRAGLIST

@@ -2066,7 +2075,8 @@
   WINCOMMCTRLAPI void WINAPI DrawInsert(HWND handParent,HWND hLB,int nItem);

WINCOMMCTRLAPI int WINAPI LBItemFromPt(HWND hLB,POINT pt,BOOL bAutoScroll);
-#endif
+
+#endif /* !NODRAGLIST */

#ifndef NOUPDOWN

@@ -2122,7 +2132,8 @@
   } NMUPDOWN,*LPNMUPDOWN;

#define UDN_DELTAPOS (UDN_FIRST - 1)
-#endif
+
+#endif /* !NOUPDOWN */

#ifndef NOPROGRESS

@@ -2190,7 +2201,8 @@
 #define HOTKEY_CLASSW L"msctls_hotkey32"

#define HOTKEY_CLASS __MINGW_NAME_AW(HOTKEY_CLASS)
-#endif
+
+#endif /* !NOHOTKEY */

#define CCS_TOP 0x1L
 #define CCS_NOMOVEY 0x2L
@@ -3184,7 +3196,8 @@

#define LVN_BEGINSCROLL (LVN_FIRST-80)
 #define LVN_ENDSCROLL (LVN_FIRST-81)
-#endif
+
+#endif /* !NOLISTVIEW */

#ifndef NOTREEVIEW

@@ -3722,7 +3735,8 @@
 #define LPNMTVGETINFOTIP __MINGW_NAME_AW(LPNMTVGETINFOTIP)

#define TVCDRF_NOIMAGES 0x10000
-#endif
+
+#endif /* !NOTREEVIEW */

#ifndef NOUSEREXCONTROLS

@@ -3875,7 +3889,7 @@
 #define LPNMCBEENDEDIT __MINGW_NAME_AW(LPNMCBEENDEDIT)
 #define PNMCBEENDEDIT __MINGW_NAME_AW(PNMCBEENDEDIT)

-#endif
+#endif /* !NOUSEREXCONTROLS */

#ifndef NOTABCONTROL

@@ -4081,7 +4095,8 @@
 #define TCN_SELCHANGING (TCN_FIRST - 2)
 #define TCN_GETOBJECT (TCN_FIRST - 3)
 #define TCN_FOCUSCHANGE (TCN_FIRST - 4)
-#endif
+
+#endif /* !NOTABCONTROL */

#ifndef NOANIMATE

@@ -4114,9 +4129,11 @@
 #define Animate_Stop(hwnd) (BOOL)SNDMSG(hwnd,ACM_STOP,0,0)
 #define Animate_Close(hwnd) Animate_Open(hwnd,NULL)
 #define Animate_Seek(hwnd,frame) Animate_Play(hwnd,frame,frame,1)
-#endif
+
+#endif /* !NOANIMATE */

#ifndef NOMONTHCAL
+
 #define MONTHCAL_CLASSW L"SysMonthCal32"
 #define MONTHCAL_CLASSA "SysMonthCal32"

@@ -4258,9 +4275,11 @@

#define GMR_VISIBLE 0
 #define GMR_DAYSTATE 1
-#endif
+
+#endif /* !NOMONTHCAL */

#ifndef NODATETIMEPICK
+
 #define DATETIMEPICK_CLASSW L"SysDateTimePick32"
 #define DATETIMEPICK_CLASSA "SysDateTimePick32"

@@ -4401,6 +4420,7 @@
 #define GDT_NONE 1

#ifndef NOIPADDRESS
+
 #define IPM_CLEARADDRESS (WM_USER+100)
 #define IPM_SETADDRESS (WM_USER+101)
 #define IPM_GETADDRESS (WM_USER+102)
@@ -4428,9 +4448,11 @@
 #define SECOND_IPADDRESS(x) ((x>>16) & 0xff)
 #define THIRD_IPADDRESS(x) ((x>>8) & 0xff)
 #define FOURTH_IPADDRESS(x) (x & 0xff)
-#endif
+
+#endif /* !NOIPADDRESS */

#ifndef NOPAGESCROLLER
+
 #define WC_PAGESCROLLERW L"SysPager"
 #define WC_PAGESCROLLERA "SysPager"

@@ -4535,7 +4557,8 @@
     int idNew;
     DWORD dwFlags;
   } NMPGHOTITEM,*LPNMPGHOTITEM;
-#endif
+
+#endif /* !NOPAGESCROLLER */

#ifndef NONATIVEFONTCTL

@@ -4550,9 +4573,11 @@
 #define NFS_BUTTON 0x8
 #define NFS_ALL 0x10
 #define NFS_USEFONTASSOC 0x20
-#endif
+
+#endif /* !NONATIVEFONTCTL */

#ifndef NOBUTTON
+
 #define WC_BUTTONA "Button"
 #define WC_BUTTONW L"Button"

@@ -4593,15 +4618,17 @@

#define BST_HOT 0x200

-#endif
+#endif /* !NOBUTTON */

#ifndef NOSTATIC
+
 #define WC_STATICA "Static"
 #define WC_STATICW L"Static"

#define WC_STATIC __MINGW_NAME_AW(WC_STATIC)

#ifndef NOEDIT
+
 #define WC_EDITA "Edit"
 #define WC_EDITW L"Edit"

@@ -4622,23 +4649,20 @@
 #define Edit_ShowBalloonTip(hwnd,peditballoontip) (BOOL)SNDMSG((hwnd),EM_SHOWBALLOONTIP,0,(LPARAM)(peditballoontip))
 #define EM_HIDEBALLOONTIP (ECM_FIRST+4)
 #define Edit_HideBalloonTip(hwnd) (BOOL)SNDMSG((hwnd),EM_HIDEBALLOONTIP,0,0)
-#endif
+
+#endif /* !NOEDIT */

#ifndef NOLISTBOX
 #define WC_LISTBOXA "ListBox"
 #define WC_LISTBOXW L"ListBox"
-
 #define WC_LISTBOX __MINGW_NAME_AW(WC_LISTBOX)
-
-#endif
+#endif /* !NOLISTBOX */

#ifndef NOCOMBOBOX
 #define WC_COMBOBOXA "ComboBox"
 #define WC_COMBOBOXW L"ComboBox"
-
 #define WC_COMBOBOX __MINGW_NAME_AW(WC_COMBOBOX)
-
-#endif
+#endif /* !NOCOMBOBOX */

#define CB_SETMINVISIBLE (CBM_FIRST+1)
 #define CB_GETMINVISIBLE (CBM_FIRST+2)
@@ -4649,10 +4673,8 @@
 #ifndef NOSCROLLBAR
 #define WC_SCROLLBARA "ScrollBar"
 #define WC_SCROLLBARW L"ScrollBar"
-
 #define WC_SCROLLBAR __MINGW_NAME_AW(WC_SCROLLBAR)
-
-#endif
+#endif /* !NOSCROLLBAR */

#define INVALID_LINK_INDEX (-1)
 #define MAX_LINKID_TEXT 48
@@ -4700,7 +4722,8 @@
   void WINAPI InitMUILanguage(LANGID uiLang);
   LANGID WINAPI GetMUILanguage(void);
 #endif
-#endif
+
+#endif /* !NOSTATIC */

#define DA_LAST (0x7fffffff)
 #define DPA_APPEND (0x7fffffff)
@@ -4910,7 +4933,8 @@
     HWND hwndTrack;
     DWORD dwHoverTime;
   } TRACKMOUSEEVENT,*LPTRACKMOUSEEVENT;
-#endif
+
+#endif /* !TME_HOVER */

WINCOMMCTRLAPI
   BOOL
@@ -4918,7 +4942,7 @@
   _TrackMouseEvent(
     _Inout_ LPTRACKMOUSEEVENT lpEventTrack);

-#endif
+#endif /* !NOTRACKMOUSEEVENT */

#ifndef NOFLATSBAPIS

@@ -4959,8 +4983,10 @@
 #define FlatSB_SetScrollPropPtr FlatSB_SetScrollProp
   WINCOMMCTRLAPI BOOL WINAPI InitializeFlatSB(HWND);
   WINCOMMCTRLAPI HRESULT WINAPI UninitializeFlatSB(HWND);
-#endif
-#endif
+
+#endif /* !NOFLATSBAPIS */
+
+#endif /* !NODATETIMEPICK */

typedef LRESULT (CALLBACK *SUBCLASSPROC)(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam,UINT_PTR uIdSubclass,DWORD_PTR dwRefData);

@@ -5101,7 +5127,7 @@

#include <poppack.h>

-#endif /* NOTASKDIALOG */
+#endif /* !NOTASKDIALOG */

#if (NTDDI_VERSION >= NTDDI_VISTA)
 enum _LI_METRIC
@@ -5115,5 +5141,6 @@
 }
 #endif

-#endif
-#endif
+#endif /* !NOUSER */
+
+#endif /* _INC_COMMCTRL */