From 70ef520055a50c751efe22b2bfab63e682275433 Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Mon, 12 Oct 2015 12:28:30 +0000
Subject: [PATCH] * MUI_LANGUAGE usage warning was incorrectly displayed in
 some page combinations * Fixed broken CCM_* defines in WinMessages.nsh

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6624 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Modern UI/System.nsh |  3 ++-
 Include/WinMessages.nsh      | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index f7cfa6da..1d4d5a6c 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -2094,7 +2094,8 @@ Var MUI_TEMP2
   !verbose push
   !verbose ${MUI_VERBOSE}
 
-  !ifndef MUI_PAGE_UNINSTALLER_PREFIX
+  ; MUI_PAGE_UNINSTALLER_PREFIX is undefined by uninstaller pages so we check MUI_UNINSTALLER as well
+  !ifndef MUI_PAGE_UNINSTALLER_PREFIX && MUI_UNINSTALLER
     !warning "MUI_LANGUAGE should be inserted after the MUI_[UN]PAGE_* macros"
   !endif
 
diff --git a/Include/WinMessages.nsh b/Include/WinMessages.nsh
index c8e3a05d..cd9c1745 100644
--- a/Include/WinMessages.nsh
+++ b/Include/WinMessages.nsh
@@ -99,13 +99,13 @@ UDM     Up-down control
 
 #Generic Common Control Messages#
 !define CCM_FIRST 0x2000
-!define CCM_SETBKCOLOR       /math ${CCM_FIRST} + 0x1 ; IE4
-!define CCM_SETUNICODEFORMAT /math ${CCM_FIRST} + 0x5 
-!define CCM_GETUNICODEFORMAT /math ${CCM_FIRST} + 0x6
-!define CCM_SETVERSION       /math ${CCM_FIRST} + 0x7 ; IE5
-!define CCM_GETVERSION       /math ${CCM_FIRST} + 0x8
-!define CCM_SETWINDOWTHEME   /math ${CCM_FIRST} + 0xB ; WinXP
-!define CCM_DPISCALE         /math ${CCM_FIRST} + 0xC
+!define /math CCM_SETBKCOLOR       ${CCM_FIRST} + 0x1 ; IE4
+!define /math CCM_SETUNICODEFORMAT ${CCM_FIRST} + 0x5 
+!define /math CCM_GETUNICODEFORMAT ${CCM_FIRST} + 0x6
+!define /math CCM_SETVERSION       ${CCM_FIRST} + 0x7 ; IE5
+!define /math CCM_GETVERSION       ${CCM_FIRST} + 0x8
+!define /math CCM_SETWINDOWTHEME   ${CCM_FIRST} + 0xB ; WinXP
+!define /math CCM_DPISCALE         ${CCM_FIRST} + 0xC
 
 !define CCS_TOP 1
 !define CCS_BOTTOM 3