From 924dc4d4eff3bb060e3011a6b88bdda18ae4a351 Mon Sep 17 00:00:00 2001
From: Don Ho <don.h@free.fr>
Date: Sat, 17 May 2014 14:22:31 +0000
Subject: [PATCH] [BUG_FIXED] (Author: Andreas Jonsson) Fix a bug in NppShell
 when trying to open many files.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1239 f5eea248-9336-0410-98b8-ebc06183d4e3
---
 PowerEditor/bin/NppShell.dll                  | Bin 260096 -> 260608 bytes
 PowerEditor/bin/NppShell64.dll                | Bin 222720 -> 222720 bytes
 PowerEditor/installer/nppSetup.nsi            |  16 ++--
 .../src/tools/NppShell/src/NppShell.cpp       |  78 +++++++++++-------
 PowerEditor/src/tools/NppShell/src/NppShell.h |   1 +
 5 files changed, 60 insertions(+), 35 deletions(-)

diff --git a/PowerEditor/bin/NppShell.dll b/PowerEditor/bin/NppShell.dll
index 9c1ece20c16dc32275a1f4bafc144ceb30751dbb..d34d3eac952725a955dc0b26cdca5bd25450b6eb 100644
GIT binary patch
delta 2239
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
HOd0bRgu_o0

delta 2113
zcmbVN4{Q@<6#wpa!#X;5{OQ={0-H_{VWeHVtzWOl#@r&J3vH8OB#><U8Rr6+KqoPa
zv``K>&eQ49umBn0a2Wy<DGZ_vIs^&?<1_&^+2o%jEhG2`gn@(lzPoJ<HJW(Iz3;v6
zeeb>B`}5uTZ>RWwN!d=NPMLmjChC7KAv$|F^&~>AYAWTRr_WP8)C}60tXeKSqlPJa
z(%HRml7+WbrRho3esu~xfx52F0(xIvNoPD&kPgZ$2B8dCe+)I#Wi&M+bc0Ev=(Stb
z-o&vZs<$F^PJ052a~NZ6R%pVok!f^Wdx#smd8Lne0-=bQb1xpJz(YiQ9ynltvjNAz
zrf?~lVujn?h*iXv2l2QoZray@*uV*+qHF}&Eu<qF)gUEEv>pMB{c)2aj95vW3_b$w
zgd*=4q4OeQqitmC1ammC82MwHd;ne1g1TzJM-39XAdsv(j+@xOdZ|s5g9M_iK~`R6
zX-OgAdvXN!5_o@I_bvwsGEdyZfCD{L?%yJvgGj!A2{lp<64wb@KuO~xVixR>`t+p8
z8XpK#lE%p8202KyoO|^0e3FWOz(o}9Ou*uYswHT+C5@6Cd{B&Vf-d*8%33bpT-I~a
z!-HWj7)qj<q}EO-s?8BxB-<suS}kRfWD9+Hl<l+xgsf-eAUR$wCFy-N(1XQRl=Xi=
z>uP+1B_F8Rqmo<0)spxgcoym*n5+<A?zm|VlvD{4bC0Zng1}_&pH7h(@+hJo7OlSm
zsrk^7`yL;X+VR3h5=+AknQO6h^T*;p*58Pj3H}F~LU^qygwdKp7}Av40vTsTB+y;5
zLblyLxxyfqWI_t0J3_<%OSDI-DJ2)c4lX^>jB3&qV?-okDd38T3xFf{t6DD0grW){
zDoO*CHqG5{rBA<3Nm)PK@w6`uj;(4Z^e5<CiWmV8<V4)m2Vmv$Ot&^>da;D<fSu^p
zXwxzptl}ng94=}*;j>cK1;AXtH;HgzVLUzuitb)XsqeV^!|>DY=*flJI7y-b3}n$q
z7D;4@pf_I*5?3B!A1RZj82lJOSII$lH1fMXlR+X%L55h1gu0@?)@iEPe*)n(AU;MC
zk!DV)BpL}n0EAS<BV=7BK!{=}5F)#yMFT*HC<XiAuE-*xuIL*&kin5+piI`Vd~NRW
zwEk};`CzJzA1$G)?yJd7lj-?YD%WJECswJoO?K*MwY4dm`bzC=%Ff<hNs=;%VQ-RL
z&cZlJBYGAKE#OfuGrFShR;nX+=F=6G>dQO3C#{9UvLf_>Ne2^68zLE^8-_^6XrJo-
z_!`x$7B-jA^D9Gj&EHb=wz;91Eu$#fT&phFwJi12?Ec8LCZU1Et1x<^pQ$%?l|MUw
zK;<p1F+^YSYIT>&dIRtDB5$%>-W%-*&G}?5MKAwO{bF}1)xCeuSc*Ct8n^eQL}vZ6
zcpUyf1^W*)WanlbM67u$Vmr4WcKZRuhGF%yh^@a0Yb)%5TnsO2gEw^Ye0&r`{&4E)
zSPtz!7`Pc*cQZyEx*4N4KlJt5AJ~&{E}n)L;$^rIhw#_93r}^t<=EiZ<~Z-T;<)2T
z;Kp#7+(fRJE9a`XrQB-neeQd%o4d|E<Pw~$bBVLgxyAXZ^N{mPXF5Ng-@&)?QNDia
z*{Mv?_@e1Wi;5bH&_4L(!Dt)Jspc&63+76*U_N3#<1=3{Uo}@+wpm&%$1JBTw=DDW
z7Ug;KHsy8Zb?4p68)nV1TC85{Dr=WDX3elou+`XB*w)x`^GovU^SuRa1$PRl!WRpb
z!efQ!?HBDa`)~Gp_PBjC&cNgFbJ&J4F2-ee26o}s@Elx)7vZINIer_j#xmZBZH>4E
z-@wBhcE?r66s`iY+sSotDb94~o6Z%^BhGAo24Bkuc!l4@@8J*gNB9o@(9u{z3HyPW
F`4h~A@3jB`

diff --git a/PowerEditor/bin/NppShell64.dll b/PowerEditor/bin/NppShell64.dll
index 03d8463efb011ff8eee3c81965ce2a84769586fe..cf6f8f6c51d9138e02eb4dba376628fc460a5545 100644
GIT binary patch
delta 3495
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

delta 3280
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
ZdDr24-28O3*Vx%>>=e!#JH;>l`9HWU)o}m-

diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 83ccb090..3667ddd7 100644
--- a/PowerEditor/installer/nppSetup.nsi
+++ b/PowerEditor/installer/nppSetup.nsi
@@ -28,10 +28,10 @@
 ; Define the application name
 !define APPNAME "Notepad++"
 
-!define APPVERSION "6.6.2"
+!define APPVERSION "6.6.3"
 !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
 !define VERSION_MAJOR 6
-!define VERSION_MINOR 62
+!define VERSION_MINOR 63
 
 !define APPWEBSITE "http://notepad-plus-plus.org/"
 
@@ -606,6 +606,10 @@ Section -"Notepad++" mainSection
 		Exec 'regsvr32 /u /s "$INSTDIR\NppShell_04.dll"'
 		Delete "$INSTDIR\NppShell_04.dll"
 		
+	IfFileExists "$INSTDIR\NppShell_05.dll" 0 +3
+		Exec 'regsvr32 /u /s "$INSTDIR\NppShell_05.dll"'
+		Delete "$INSTDIR\NppShell_05.dll"
+		
 	; detect the right of 
 	UserInfo::GetAccountType
 	Pop $1
@@ -635,12 +639,12 @@ Section "Context Menu Entry" explorerContextMenu
 	SetOverwrite try
 	SetOutPath "$INSTDIR\"
 	${If} ${RunningX64}
-		File /oname=$INSTDIR\NppShell_05.dll "..\bin\NppShell64_05.dll"
+		File /oname=$INSTDIR\NppShell_06.dll "..\bin\NppShell64_06.dll"
 	${Else}
-		File "..\bin\NppShell_05.dll"
+		File "..\bin\NppShell_06.dll"
 	${EndIf}
 	
-	Exec 'regsvr32 /s "$INSTDIR\NppShell_05.dll"'
+	Exec 'regsvr32 /s "$INSTDIR\NppShell_06.dll"'
 SectionEnd
 
 SectionGroup "Auto-completion Files" autoCompletionComponent
@@ -1768,11 +1772,13 @@ Section un.explorerContextMenu
 	Exec 'regsvr32 /u /s "$INSTDIR\NppShell_03.dll"'
 	Exec 'regsvr32 /u /s "$INSTDIR\NppShell_04.dll"'
 	Exec 'regsvr32 /u /s "$INSTDIR\NppShell_05.dll"'
+	Exec 'regsvr32 /u /s "$INSTDIR\NppShell_06.dll"'
 	Delete "$INSTDIR\NppShell_01.dll"
 	Delete "$INSTDIR\NppShell_02.dll"
 	Delete "$INSTDIR\NppShell_03.dll"
 	Delete "$INSTDIR\NppShell_04.dll"
 	Delete "$INSTDIR\NppShell_05.dll"
+	Delete "$INSTDIR\NppShell_06.dll"
 SectionEnd
 
 Section un.UnregisterFileExt
diff --git a/PowerEditor/src/tools/NppShell/src/NppShell.cpp b/PowerEditor/src/tools/NppShell/src/NppShell.cpp
index df4627b1..60239f8d 100644
--- a/PowerEditor/src/tools/NppShell/src/NppShell.cpp
+++ b/PowerEditor/src/tools/NppShell/src/NppShell.cpp
@@ -955,9 +955,12 @@ void InvalidateIcon(HICON * iconSmall, HICON * iconLarge) {
 STDMETHODIMP CShellExt::InvokeNPP(HWND /*hParent*/, LPCSTR /*pszWorkingDir*/, LPCSTR /*pszCmd*/, LPCSTR /*pszParam*/, int iShowCmd) {
 	TCHAR szFilename[MAX_PATH];
 	TCHAR szCustom[MAX_PATH];
+	TCHAR szNotepadExecutableFilename[3 * MAX_PATH]; // Should be able to contain szFilename plus szCustom plus some additional characters.
 	LPTSTR pszCommand;
 	size_t bytesRequired = 1;
 
+	memset(szNotepadExecutableFilename, 0, sizeof(TCHAR) * 3 * MAX_PATH);
+
 	TCHAR szKeyTemp[MAX_PATH + GUID_STRING_SIZE];
 	DWORD regSize = 0;
 	DWORD pathSize = MAX_PATH;
@@ -1002,46 +1005,61 @@ STDMETHODIMP CShellExt::InvokeNPP(HWND /*hParent*/, LPCSTR /*pszWorkingDir*/, LP
 	regSize = (DWORD)MAX_PATH*sizeof(TCHAR);
 	result = RegQueryValueEx(settingKey, TEXT("Path"), NULL, NULL, (LPBYTE)(szFilename), &regSize);
 	szFilename[MAX_PATH-1] = 0;
-	lstrcat(pszCommand, TEXT("\""));
-	lstrcat(pszCommand, szFilename);
-	lstrcat(pszCommand, TEXT("\""));
+	lstrcat(szNotepadExecutableFilename, TEXT("\""));
+	lstrcat(szNotepadExecutableFilename, szFilename);
+	lstrcat(szNotepadExecutableFilename, TEXT("\""));
 	result = RegQueryValueEx(settingKey, TEXT("Custom"), NULL, NULL, (LPBYTE)(szCustom), &pathSize);
 	if (result == ERROR_SUCCESS) {
-		lstrcat(pszCommand, TEXT(" "));
-		lstrcat(pszCommand, szCustom);
+		lstrcat(szNotepadExecutableFilename, TEXT(" "));
+		lstrcat(szNotepadExecutableFilename, szCustom);
 	}
 	RegCloseKey(settingKey);
 
-	for (UINT i = 0; i < m_cbFiles; i++) {
-		DragQueryFile((HDROP)m_stgMedium.hGlobal, i, szFilename, MAX_PATH);
-		lstrcat(pszCommand, TEXT(" \""));
-		lstrcat(pszCommand, szFilename);
-		lstrcat(pszCommand, TEXT("\""));
-	}
+	// We have to open the files in batches. A command on the command-line can be at most
+	// 2048 characters in XP and 32768 characters in Win7. In the degenerate case where all
+	// paths are of length MAX_PATH, we can open at most x files at once, where:
+	// 260 * (x + 2) = 2048 or 32768 <=> x = 5 or x = 124.
+	// Note the +2 to account for the path to notepad++.exe.
+	// http://stackoverflow.com/questions/3205027/maximum-length-of-command-line-string
 
-	STARTUPINFO si;
-	PROCESS_INFORMATION pi;
-	ZeroMemory(&si, sizeof(si));
-	si.cb = sizeof(si);
-	si.dwFlags = STARTF_USESHOWWINDOW;
-	si.wShowWindow = (WORD)iShowCmd;	//SW_RESTORE;
-	if (!CreateProcess (NULL, pszCommand, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) {
-		DWORD errorCode = GetLastError();
-		if (errorCode == ERROR_ELEVATION_REQUIRED) {	//Fallback to shellexecute
-			CoInitializeEx(NULL, 0);
-			HINSTANCE execVal = ShellExecute(NULL, TEXT("runas"), pszCommand, NULL, NULL, iShowCmd);
-			CoUninitialize();
-			if (execVal <= (HINSTANCE)32) {
+	const UINT kiBatchSize = m_winVer > WINVER_XP ? 100 : 4;
+
+	UINT iFileIndex = 0;
+	while(iFileIndex < m_cbFiles) {
+		memset(pszCommand, 0, bytesRequired);
+		lstrcat(pszCommand, szNotepadExecutableFilename);
+		for (UINT iBatchSizeCounter = 0; iFileIndex < m_cbFiles && iBatchSizeCounter < kiBatchSize; iBatchSizeCounter++) {
+			DragQueryFile((HDROP)m_stgMedium.hGlobal, iFileIndex, szFilename, MAX_PATH);
+			lstrcat(pszCommand, TEXT(" \""));
+			lstrcat(pszCommand, szFilename);
+			lstrcat(pszCommand, TEXT("\""));
+			iFileIndex++;
+		}
+
+		STARTUPINFO si;
+		PROCESS_INFORMATION pi;
+		ZeroMemory(&si, sizeof(si));
+		si.cb = sizeof(si);
+		si.dwFlags = STARTF_USESHOWWINDOW;
+		si.wShowWindow = (WORD)iShowCmd;	//SW_RESTORE;
+		if (!CreateProcess (NULL, pszCommand, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) {
+			DWORD errorCode = GetLastError();
+			if (errorCode == ERROR_ELEVATION_REQUIRED) {	//Fallback to shellexecute
+				CoInitializeEx(NULL, 0);
+				HINSTANCE execVal = ShellExecute(NULL, TEXT("runas"), pszCommand, NULL, NULL, iShowCmd);
+				CoUninitialize();
+				if (execVal <= (HINSTANCE)32) {
+					TCHAR * message = new TCHAR[512+bytesRequired];
+					wsprintf(message, TEXT("ShellExecute failed (%d): Is this command correct?\r\n%s"), execVal, pszCommand);
+					MsgBoxError(message);
+					delete [] message;
+				}
+			} else {
 				TCHAR * message = new TCHAR[512+bytesRequired];
-				wsprintf(message, TEXT("ShellExecute failed (%d): Is this command correct?\r\n%s"), execVal, pszCommand);
+				wsprintf(message, TEXT("Error in CreateProcess (%d): Is this command correct?\r\n%s"), errorCode, pszCommand);
 				MsgBoxError(message);
 				delete [] message;
 			}
-		} else {
-			TCHAR * message = new TCHAR[512+bytesRequired];
-			wsprintf(message, TEXT("Error in CreateProcess (%d): Is this command correct?\r\n%s"), errorCode, pszCommand);
-			MsgBoxError(message);
-			delete [] message;
 		}
 	}
 
diff --git a/PowerEditor/src/tools/NppShell/src/NppShell.h b/PowerEditor/src/tools/NppShell/src/NppShell.h
index aa915856..a98bdd48 100644
--- a/PowerEditor/src/tools/NppShell/src/NppShell.h
+++ b/PowerEditor/src/tools/NppShell/src/NppShell.h
@@ -17,6 +17,7 @@
 #include <shlwapi.h>
 
 #define WINVER_VISTA 0x600
+#define WINVER_XP	 0x0501
 
 //This is not ideal, but missing from current mingw
 #ifndef ERROR_ELEVATION_REQUIRED