[RELEASE] Notepad++ v5.6.6 release.

[BUG_FIXED] Fixed Search bug with Chinese/Japanese/Korean characters.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@605 f5eea248-9336-0410-98b8-ebc06183d4e3

PowerEditor/bin/change.log

@@ -1,3 +1,9 @@
+Notepad++ v5.6.6 new features and fixed bugs (from v5.6.5) :
+
+1.  Fixed Search bug with Chinese/Japanese/Korean characters.
+
+
+
 Notepad++ v5.6.5 new features and fixed bugs (from v5.6.4) :
 
 1.  Fix loading encoding file making file corrupted (after saving).
@@ -70,9 +76,8 @@ Included plugins (Unicode):
 2.  Spell Checker v1.3.3
 3.  MIME Tools v1.6
 4.  NppExport v0.2.8
-5.  NppNetNote v0.1
+5.  Compare Plugin 1.5.5
-6.  Compare Plugin 1.5.5
+6.  Plugin Manager 0.9.3.0
-7.  Plugin Manager 0.9.3.0
 
 
 Included plugins (ANSI):
@@ -83,7 +88,7 @@ Included plugins (ANSI):
 4.  MIME Tools v1.6
 5.  NppExport v0.2.8
 6.  Light Explorer v1.6
-7.  NppNetNote v0.1
+7.  Compare Plugin 1.5.5
-8.  Compare Plugin 1.5.5
+8.  Plugin Manager 0.9.3.0
-9.  Plugin Manager 0.9.3.0
+
 

PowerEditor/installer/nativeLang/danish.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252" ?>
 <NotepadPlus>
 	<Native-Langue name = "Dansk" filename="danish.xml" >
-	<!-- Updated for ver. 5.6.1 -->
+	<!-- Updated for ver. 5.6.5 -->
 		<Menu>
 			<Main>
                 <!-- Main Menu Entries -->
@@ -28,10 +28,10 @@
 					<Item posX = "1" posY = "13" name = "Ko&amp;mmenter/afkommenter"/>
 					<Item posX = "1" posY = "14" name = "Au&amp;tofuldførelse"/>
 					<Item posX = "1" posY = "15" name = "&amp;EOL-konvertering"/>
-					<Item posX = "2" posY = "14" name = "&amp;Marker alle"/>
+					<Item posX = "2" posY = "16" name = "&amp;Marker alle"/>
-					<Item posX = "2" posY = "15" name = "&amp;Afmarker alle"/>
+					<Item posX = "2" posY = "17" name = "&amp;Afmarker alle"/>
-					<Item posX = "2" posY = "16" name = "Hop op"/>
+					<Item posX = "2" posY = "18" name = "Hop op"/>
-					<Item posX = "2" posY = "17" name = "Hop ned"/>
+					<Item posX = "2" posY = "19" name = "Hop ned"/>
 					<Item posX = "3" posY = "4" name = "&amp;Vis symbol"/>
 					<Item posX = "3" posY = "5" name = "&amp;Zoom"/>
 					<Item posX = "3" posY = "6" name = "&amp;Gå til/klon pågældende dokument"/>
@@ -160,6 +160,8 @@
 					<Item id = "43045" name = "Vinduet Fundne resultater"/>
 					<Item id = "43046" name = "Næste fundne resultat"/>
 					<Item id = "43047" name = "Forrige fundne resultat"/>
+					<Item id = "43048" name = "Marker og find næste"/>
++                   <Item id = "43049" name = "Marker og find forrige"/>
 					
                     
 					<Item id = "44009" name = "Post-it"/>
@@ -297,7 +299,7 @@
 				<Item id = "1661" name = "F&amp;ølg pågældende dok."/>
 				<Item id = "1624" name = "Søgemåde"/>
 				<Item id = "1625" name = "&amp;Normal"/>
-                <Item id = "1626" name = "&amp;Udvidet (\n, \r, \t, \0, \x...)"/>
+                <Item id = "1626" name = "&amp;Udvidet (\n, \r, \t, \0, \u, \x...)"/>
             </Find>
             <GoToLine title = "Gå til linje #">
 				<Item id = "2007" name = "Linje"/>

PowerEditor/installer/nativeLang/german.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252" ?>
 <!--
-	German localization for Notepad++ 5.6.1
+	German localization for Notepad++ 5.6.5
-	Last modified Mon, 7 December 2009 by Jan Schreiber.
+	Last modified Mon, 25 January 2010 by Jan Schreiber.
 	Please e-mail errors, suggestions etc. to janschreiber(at)users.sf.net.
 -->
 <NotepadPlus>
-	<Native-Langue name = "Deutsch" filename="german.xml">
+	<Native-Langue name = "Deutsch" filename = "german.xml">
 		<Menu>
 			<Main>
 				<!-- Main Menu Titles -->
@@ -31,10 +31,10 @@
 					<Item posX = "1" posY = "13" name = "&amp;Kommentare"/>
 					<Item posX = "1" posY = "14" name = "Autovervollst&amp;ändigung"/>
 					<Item posX = "1" posY = "15" name = "Zeile&amp;nende"/>
-					<Item posX = "2" posY = "14" name = "Alle &amp;Vorkommnisse hervorheben"/>
+					<Item posX = "2" posY = "16" name = "Alle &amp;Vorkommnisse hervorheben"/>
-					<Item posX = "2" posY = "15" name = "Alle &amp;Hervorhebungen löschen"/>
+					<Item posX = "2" posY = "17" name = "Alle &amp;Hervorhebungen löschen"/>
-					<Item posX = "2" posY = "16" name = "Zu vorheriger Hervorhebung s&amp;pringen"/>
+					<Item posX = "2" posY = "18" name = "Zu vorheriger Hervorhebung s&amp;pringen"/>
-					<Item posX = "2" posY = "17" name = "Zu nächster Hervorhebung s&amp;pringen"/>
+					<Item posX = "2" posY = "19" name = "Zu nächster Hervorhebung s&amp;pringen"/>
 					<Item posX = "3" posY = "4" name = "Nicht &amp;druckbare Zeichen"/>
 					<Item posX = "3" posY = "5" name = "Z&amp;oom"/>
 					<Item posX = "3" posY = "6" name = "Datei &amp;verschieben/duplizieren"/>
@@ -158,6 +158,8 @@
 					<Item id = "43045" name = "Suchergebnis-&amp;Fenster"/>
 					<Item id = "43046" name = "Zu nächstem S&amp;uchergebnis springen"/>
 					<Item id = "43047" name = "Zu vorherigem S&amp;uchergebnis springen"/>
+					<Item id = "43048" name = "Ausw&amp;ählen und nächstes Vorkommnis suchen"/>
+					<Item id = "43049" name = "Ausw&amp;ählen und vorheriges Vorkommnis suchen"/>
 					<Item id = "44009" name = "&amp;Post-It"/>
 					<Item id = "44010" name = "Alle Te&amp;xtblöcke schließen"/>
 					<Item id = "44011" name = "Benutzerdefinierte Spra&amp;che ..."/>

PowerEditor/installer/nppSetup.nsi

@@ -18,10 +18,10 @@
 ; Define the application name
 !define APPNAME "Notepad++"
 
-!define APPVERSION "5.6.5"
+!define APPVERSION "5.6.6"
-!define APPNAMEANDVERSION "Notepad++ v5.6.5"
+!define APPNAMEANDVERSION "Notepad++ v5.6.6"
 !define VERSION_MAJOR 5
-!define VERSION_MINOR 65
+!define VERSION_MINOR 66
 
 !define APPWEBSITE "http://notepad-plus.sourceforge.net/"
 
@@ -29,7 +29,7 @@
 Name "${APPNAMEANDVERSION}"
 InstallDir "$PROGRAMFILES\Notepad++"
 InstallDirRegKey HKLM "Software\${APPNAME}" ""
-OutFile ".\build\npp.5.6.5.Installer.exe"
+OutFile ".\build\npp.5.6.6.Installer.exe"
 
 ; GetWindowsVersion
  ;
@@ -490,10 +490,6 @@ GLOBAL_INST:
 		Delete "$INSTDIR\NppShell.dll"
         
 		
-        
-        
-        
-		
 	; detect the right of 
 	UserInfo::GetAccountType
 	Pop $1
@@ -644,13 +640,13 @@ SubSection "Plugins" Plugins
 		File "..\bin\plugins\doc\NPPTextFXdemo.TXT"
 	SectionEnd
 
-
+/*    Work, but it's not used by many people
 	Section "NppNetNote" NppNetNote
 		Delete "$INSTDIR\plugins\NppNetNote.dll"
 		SetOutPath "$INSTDIR\plugins"
 		File "..\bin\plugins\NppNetNote.dll"
 	SectionEnd
-	
+*/
 
 	Section "Spell-Checker" SpellChecker
 		Delete "$INSTDIR\plugins\SpellChecker.dll"
@@ -793,6 +789,7 @@ SubSection "Themes" Themes
 SubSectionEnd
 
 Section /o "As default html viewer" htmlViewer
+	SetOverwrite on
 	SetOutPath "$INSTDIR\"
 	File "..\bin\nppIExplorerShell.exe"
 	WriteRegStr HKLM "SOFTWARE\Microsoft\Internet Explorer\View Source Editor\Editor Name" "" "$INSTDIR\nppIExplorerShell.exe"
@@ -801,6 +798,7 @@ SectionEnd
 InstType "o"
 
 Section "Auto-Updater" AutoUpdater
+	SetOverwrite on
 	SetOutPath "$INSTDIR\updater"
 	File "..\bin\updater\GUP.exe"
 	File "..\bin\updater\libcurl.dll"
@@ -808,7 +806,6 @@ Section "Auto-Updater" AutoUpdater
 	File "..\bin\updater\License.txt"
 	File "..\bin\updater\gpl.txt"
 	File "..\bin\updater\readme.txt"
-	File "..\bin\updater\getDownLoadUrl.php"
 SectionEnd
 
 ;--------------------------------

PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp

@@ -1742,7 +1742,9 @@ int ScintillaEditView::searchInTarget(const TCHAR * text2Find, int lenOfText2Fin
 	WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
 	unsigned int cp = execute(SCI_GETCODEPAGE); 
 	const char *text2FindA = wmc->wchar2char(text2Find, cp);
-	int targetFound = execute(SCI_SEARCHINTARGET, (WPARAM)lenOfText2Find, (LPARAM)text2FindA);
+	size_t text2FindALen = strlen(text2FindA);
+	int len = (lenOfText2Find > (int)text2FindALen)?lenOfText2Find:text2FindALen;
+	int targetFound = execute(SCI_SEARCHINTARGET, (WPARAM)len, (LPARAM)text2FindA);
 	return targetFound;
 #else
 	return execute(SCI_SEARCHINTARGET, (WPARAM)lenOfText2Find, (LPARAM)text2Find);

PowerEditor/src/resource.h

@@ -18,12 +18,12 @@
 #ifndef RESOURCE_H
 #define RESOURCE_H
 
-#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.6.5")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v5.6.6")
 
 // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71 
 // ex : #define VERSION_VALUE TEXT("5.63\0")
-#define VERSION_VALUE TEXT("5.65\0")
+#define VERSION_VALUE TEXT("5.66\0")
-#define VERSION_DIGITALVALUE 5, 6, 5, 0
+#define VERSION_DIGITALVALUE 5, 6, 6, 0
 
 #ifdef UNICODE
 #define UNICODE_ANSI_MODE TEXT("(UNICODE)")