From beb3c41aef8d658d076a3cdafba5f0a7b806d0f0 Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Fri, 25 Jun 2021 21:07:19 +0000
Subject: [PATCH] Fix old MinGW

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7274 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Makensisw/lookup.cpp | 8 ++++----
 Source/Platform.h            | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Contrib/Makensisw/lookup.cpp b/Contrib/Makensisw/lookup.cpp
index c4cbee60..f9788737 100644
--- a/Contrib/Makensisw/lookup.cpp
+++ b/Contrib/Makensisw/lookup.cpp
@@ -135,7 +135,7 @@ template<class I, class O> static HKEY ParseRegPath(I*In, O*&Path, O*&Name)
 
 HRESULT (WINAPI*g_RLMSOld)(HKEY hKey, LPCWSTR pszValue, LPWSTR pszOutBuf, DWORD cbOutBuf);
 
-static LSTATUS WINAPI RegLoadMUIStringFallbackW(HKEY hKey, LPCWSTR Name, LPWSTR Out, DWORD cbOutBuf, LPDWORD pcbData, DWORD Flags, LPCSTR pszDirectory)
+static LONG WINAPI RegLoadMUIStringFallbackW(HKEY hKey, LPCWSTR Name, LPWSTR Out, DWORD cbOutBuf, LPDWORD pcbData, DWORD Flags, LPCSTR pszDirectory)
 {
   if ((Flags & reg_mui_string_truncate) && pcbData) return ERROR_INVALID_PARAMETER;
   if (g_RLMSOld)
@@ -158,7 +158,7 @@ LPCSTR g_ModeLbl[] = { "Path:", "Path:", "Registry:", "Path:", "[Path,]Number:"
 struct DIALOGDATA {
   HRESULT (WINAPI*SHLIS)(LPCWSTR s, LPWSTR o, UINT cch, PVOID*ppvReserved);
   HRESULT (WINAPI*SHGLN)(PCWSTR p, PWSTR m, UINT cch, int*rid);
-  LSTATUS (WINAPI*RLMS)(HKEY hKey, LPCWSTR pszValue, LPWSTR pszOutBuf, DWORD cbOutBuf, LPDWORD pcbData, DWORD Flags, LPCSTR pszDirectory);
+  LONG (WINAPI*RLMS)(HKEY hKey, LPCWSTR pszValue, LPWSTR pszOutBuf, DWORD cbOutBuf, LPDWORD pcbData, DWORD Flags, LPCSTR pszDirectory);
   int (WINAPI*PPIL)(LPTSTR p);
   void*OrgParentDlgData;
   HWND hMode, hExtra, hOutTxt, hOutIco;
@@ -249,11 +249,11 @@ static INT_PTR CALLBACK LookupDlgProc(HWND hDlg, UINT Msg, WPARAM WParam, LPARAM
           {
             AppendText(pDD->hOutTxt, mod);
             AppendText(pDD->hOutTxt, (wsprintfW(path, L",%d\r\n\r\n", resid), path));
-            if (ExpandEnvironmentStringsW(mod, path, ARRAYSIZE(path)))
+            if (ExpandEnvironmentStringsW(mod, path, COUNTOF(path)))
             {
               if (HMODULE hMod = LoadLibraryExW(path, NULL, LOAD_LIBRARY_AS_DATAFILE))
               {
-                if (LoadStringW(hMod, resid, mod, ARRAYSIZE(mod)))
+                if (LoadStringW(hMod, resid, mod, COUNTOF(mod)))
                 {
                   AppendText(pDD->hOutTxt, mod);
                 }
diff --git a/Source/Platform.h b/Source/Platform.h
index 56ad2de1..8008690b 100644
--- a/Source/Platform.h
+++ b/Source/Platform.h
@@ -634,6 +634,10 @@ typedef DWORDLONG ULONGLONG,*PULONGLONG;
 #  define PBS_SMOOTH 1
 #endif
 
+#ifndef SS_REALSIZECONTROL
+#  define SS_REALSIZECONTROL 0x0040
+#endif
+
 #ifndef DS_SHELLFONT
 #  define DS_SHELLFONT (DS_SETFONT | DS_FIXEDSYS)
 #endif