From 6498e46d70752e649081b4d0592506a950a19ee0 Mon Sep 17 00:00:00 2001 From: anders_k Date: Sat, 10 Jul 2021 18:23:54 +0000 Subject: [PATCH] Added Visual Studio compatible accelerators git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7279 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Makensisw/lookup.cpp | 4 ++-- Contrib/Makensisw/resource.rc | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Contrib/Makensisw/lookup.cpp b/Contrib/Makensisw/lookup.cpp index f9788737..1dcd6452 100644 --- a/Contrib/Makensisw/lookup.cpp +++ b/Contrib/Makensisw/lookup.cpp @@ -64,7 +64,7 @@ template static ULARGE_INTEGER PathParseIconLocationEx(T*Path) return (li.HighPart = (UINT) comma, li.LowPart = idx, li); } -template static int WINAPI PathParseIconLocationFallback(T*Path) +static int WINAPI PathParseIconLocationFallback(LPSTR Path) { ULARGE_INTEGER li = PathParseIconLocationEx(Path); return li.LowPart; @@ -353,7 +353,7 @@ INT_PTR ShowLookupDialog(HWND hOwner) if (!dd.PPIL || (SupportsWNT4() || IsWin9598ME())) { (FARPROC&) dd.PPIL = GetSysProcAddr("SHELL32", (LPCSTR) 249); // WNT4+ PathParseIconLocationT - if (sizeof(TCHAR) == 1) (FARPROC&) dd.PPIL = (FARPROC) PathParseIconLocationFallback; + if (sizeof(TCHAR) == 1) (FARPROC&) dd.PPIL = (FARPROC) PathParseIconLocationFallback; } #endif diff --git a/Contrib/Makensisw/resource.rc b/Contrib/Makensisw/resource.rc index dcd29584..8c3ea945 100644 --- a/Contrib/Makensisw/resource.rc +++ b/Contrib/Makensisw/resource.rc @@ -145,13 +145,17 @@ BEGIN "F", IDM_FIND, VIRTKEY, CONTROL, NOINVERT "L", IDM_LOADSCRIPT, VIRTKEY, CONTROL, NOINVERT "M", IDM_RECOMPILE_TEST, VIRTKEY, CONTROL, NOINVERT + VK_F5, IDM_RECOMPILE_TEST, VIRTKEY, NOINVERT "R", IDM_RECOMPILE, VIRTKEY, CONTROL, NOINVERT + VK_F7, IDM_RECOMPILE, VIRTKEY, NOINVERT "S", IDM_SETTINGS, VIRTKEY, CONTROL, NOINVERT "T", IDM_TEST, VIRTKEY, CONTROL, NOINVERT + VK_F5, IDM_TEST, VIRTKEY, CONTROL, NOINVERT VK_F1, IDM_DOCS, VIRTKEY, NOINVERT "W", IDM_CLEARLOG, VIRTKEY, CONTROL, NOINVERT "X", IDM_EXIT, VIRTKEY, ALT, NOINVERT "K", IDM_CANCEL, VIRTKEY, CONTROL, NOINVERT + VK_CANCEL, IDM_CANCEL, VIRTKEY, CONTROL, NOINVERT END