dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Old MinGW somehow has the TRIVERTEX struct unprotected but GRADIENT_FILL_* behind WINVER >= 0x0500 and GradientFill behind WINVER >= 0x0410

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7045 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2018-11-07 02:36:21 +00:00
parent bfb5c0d76e
commit 1d5d59eb24
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Contrib/Makensisw/makensisw.h
View file

@ -247,10 +247,4 @@ typedef struct ToolTipStruct {
HHOOK hook;
} NTOOLTIP;
static void EnableUICommand(UINT Id, INT_PTR Enabled)
{
EnableToolBarButton(Id, !!Enabled);
EnableMenuItem(g_sdata.menu, Id, Enabled ? MF_ENABLED : MF_GRAYED);
}
#endif

8
Contrib/Makensisw/utils.cpp
View file

@ -36,7 +36,7 @@ WINUSERAPI HMONITOR WINAPI MonitorFromWindow(HWND hwnd, DWORD dwFlags);
#if !defined(_WIN32_WINNT) || _WIN32_WINNT-0 < 0x0410
typedef USHORT COLOR16;
typedef struct _TRIVERTEX { LONG x, y; COLOR16 Red, Green, Blue, Alpha; } TRIVERTEX, *PTRIVERTEX, *LPTRIVERTEX;
WINGDIAPI BOOL WINAPI GradientFill(HDC,PTRIVERTEX,ULONG,PVOID,ULONG,ULONG);
WINGDIAPI BOOL WINAPI GradientFill(HDC,TRIVERTEX*,ULONG,PVOID,ULONG,ULONG);
#endif
#endif
@ -1132,3 +1132,9 @@ bool RicheditHasSelection(HWND hRE)
SendMessage(hRE, EM_EXGETSEL, 0, (LPARAM) &tr);
return tr.cpMax - tr.cpMin <= 0 ? FALSE : TRUE;
}
void EnableUICommand(UINT Id, INT_PTR Enabled)
{
EnableToolBarButton(Id, !!Enabled);
EnableMenuItem(g_sdata.menu, Id, Enabled ? MF_ENABLED : MF_GRAYED);
}

2
Contrib/Makensisw/utils.h
View file

@ -119,4 +119,6 @@ static inline void GetGripperPos(HWND hwnd, RECT&r)
bool RicheditHasSelection(HWND hRE);
void EnableUICommand(UINT Id, INT_PTR Enabled);
#endif