The WIN_BOOL/ULONG dance no longer needed

vcl/win/inc/saldata.hxx

@@ -161,8 +161,8 @@ struct SalShlData
     UINT                    mnWheelScrollLines;     // WheelScrollLines
     UINT                    mnWheelScrollChars;     // WheelScrollChars
     UINT                    mnWheelMsgId;           // Wheel-Message-Id fuer W95
-    WIN_BOOL                mbWXP;                  // Windows XP
-    WIN_BOOL                mbWPrinter;             // true: use unicode printer functions
+    BOOL                    mbWXP;                  // Windows XP
+    BOOL                    mbWPrinter;             // true: use unicode printer functions
                                                     // false: use anis compat printer functions
     OSVERSIONINFO           maVersionInfo;
 };

vcl/win/source/app/salinst.cxx

@@ -68,12 +68,10 @@
 #pragma warning( disable: 4917 )
 #endif
 
-#define ULONG WIN_ULONG
 #include <GdiPlus.h>
 #include <GdiPlusEnums.h>
 #include <GdiPlusColor.h>
 #include <Shlobj.h>
-#undef ULONG
 
 #if defined _MSC_VER
 #pragma warning(pop)

vcl/win/source/gdi/winlayout.cxx

@@ -58,11 +58,9 @@
 
 #define USE_UNISCRIBE
 #ifdef USE_UNISCRIBE
-#define ULONG WIN_ULONG
 #include <Usp10.h>
 #include <ShLwApi.h>
 #include <winver.h>
-#undef ULONG
 #endif // USE_UNISCRIBE
 
 #include <boost/unordered_map.hpp>