From 16f3ff503fd92cbddeee71410490b5a655fc0a1b Mon Sep 17 00:00:00 2001
From: rainwater <rainwater@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Wed, 11 Sep 2002 00:26:18 +0000
Subject: [PATCH] Added ctrl+c support at the window level.  Exit is now Alt+X.
  Free clipboard memory.

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@982 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Makensisw/Readme.txt    |  2 +-
 Contrib/Makensisw/makensisw.cpp | 20 ++++++++++----------
 Contrib/Makensisw/resource.rc   |  7 ++++---
 Contrib/Makensisw/utils.cpp     |  5 +++--
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Contrib/Makensisw/Readme.txt b/Contrib/Makensisw/Readme.txt
index 2f59a4ce..d4eb3a9a 100644
--- a/Contrib/Makensisw/Readme.txt
+++ b/Contrib/Makensisw/Readme.txt
@@ -148,7 +148,7 @@ Version History
  - Updated icon to Trace's modern NSIS icon
  - Added Load Script option on File menu
  - Added Search Dialog (Ctrl+F) (Kickik)
- - Added Select All (Ctrl+A)
+ - Added Select All (Ctrl+A), Copy (Ctrl+C), Exit (Alt+X) keys
 
 
 Copyright Information
diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp
index 1afad878..52fe9a38 100644
--- a/Contrib/Makensisw/makensisw.cpp
+++ b/Contrib/Makensisw/makensisw.cpp
@@ -58,16 +58,16 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, char *cmdParam, int cmd
 	haccel = LoadAccelerators(g_hInstance, MAKEINTRESOURCE(IDK_ACCEL)); 
 	MSG	msg;
 	int status;
-	while ((status=GetMessage(&msg,0,0,0))!=0) {
-	if (status==-1) return -1;
-    if (!IsDialogMessage(hwndFind, &msg)) {
-      if (!TranslateAccelerator(hDialog,haccel,&msg)) {
-        if (!IsDialogMessage(hDialog,&msg)) {
-          TranslateMessage(&msg);
-          DispatchMessage(&msg);
-        }
-      }
-    }
+		while ((status=GetMessage(&msg,0,0,0))!=0) {
+		if (status==-1) return -1;
+		if (!IsDialogMessage(hwndFind, &msg)) {
+			if (!TranslateAccelerator(hDialog,haccel,&msg)) {
+				if (!IsDialogMessage(hDialog,&msg)) {
+				TranslateMessage(&msg);
+				DispatchMessage(&msg);
+				}
+			}
+		}
 	}
 	ExitProcess(msg.wParam);
 	return msg.wParam;
diff --git a/Contrib/Makensisw/resource.rc b/Contrib/Makensisw/resource.rc
index ca54d5a1..fbf24252 100644
--- a/Contrib/Makensisw/resource.rc
+++ b/Contrib/Makensisw/resource.rc
@@ -71,14 +71,14 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Load Script...",             IDM_LOADSCRIPT
         MENUITEM SEPARATOR
-        MENUITEM "E&xit\tCtrl+X",               IDM_EXIT
+        MENUITEM "E&xit\tAlt+X",                IDM_EXIT
     END
     POPUP "&Edit"
     BEGIN
         MENUITEM "Edit Script\tCtrl+E",         IDM_EDITSCRIPT
         MENUITEM SEPARATOR
+        MENUITEM "&Copy\tCtrl+C",               IDM_COPYSELECTED
         MENUITEM "Copy &All",                   IDM_COPY
-        MENUITEM "Copy &Selected",              IDM_COPYSELECTED
         MENUITEM SEPARATOR
         MENUITEM "Find...\tCtrl+F",             IDM_FIND
         MENUITEM SEPARATOR
@@ -102,11 +102,12 @@ END
 IDK_ACCEL ACCELERATORS PRELOAD MOVEABLE PURE 
 BEGIN
     "A",            IDM_SELECTALL,          VIRTKEY, CONTROL, NOINVERT
+    "C",            IDM_COPYSELECTED,       VIRTKEY, CONTROL, NOINVERT
     "E",            IDM_EDITSCRIPT,         VIRTKEY, CONTROL, NOINVERT
     "F",            IDM_FIND,               VIRTKEY, CONTROL, NOINVERT
     "R",            IDM_RECOMPILE,          VIRTKEY, CONTROL, NOINVERT
     "T",            IDM_TEST,               VIRTKEY, CONTROL, NOINVERT
-    "X",            IDM_EXIT,               VIRTKEY, CONTROL, NOINVERT
+    "X",            IDM_EXIT,               VIRTKEY, ALT, NOINVERT
 END
 
 
diff --git a/Contrib/Makensisw/utils.cpp b/Contrib/Makensisw/utils.cpp
index 83163886..a5b22901 100644
--- a/Contrib/Makensisw/utils.cpp
+++ b/Contrib/Makensisw/utils.cpp
@@ -43,9 +43,10 @@ void CopyToClipboard(HWND hwnd) {
 	EmptyClipboard();
 	existing_text[0]=0;
 	GetDlgItemText(hwnd, IDC_LOGWIN, existing_text, len);
-	GlobalUnlock(mem);
 	SetClipboardData(CF_TEXT,existing_text);
 	CloseClipboard();
+	GlobalUnlock(mem);
+	GlobalFree(mem);
 }
 
 
@@ -193,7 +194,7 @@ void SaveWindowPos(HWND hwnd) {
 	p.length = sizeof(p);
 	GetWindowPlacement(hwnd, &p);
 	if (RegCreateKey(REGSEC,REGKEY,&hKey) == ERROR_SUCCESS) {
-				RegSetValueEx(hKey,REGLOC,0,REG_BINARY,(unsigned char*)&p,sizeof(p));
+		RegSetValueEx(hKey,REGLOC,0,REG_BINARY,(unsigned char*)&p,sizeof(p));
 		RegCloseKey(hKey);
 	}
 }