From 246fe74059e7cd487fd4de8f40a1986395e1a283 Mon Sep 17 00:00:00 2001 From: RaiKoHoff Date: Mon, 4 May 2020 18:34:02 +0200 Subject: [PATCH] + fix: grepWinNP3 : resource file -> ANSI (CP-1252) () --- Versions/build.txt | 2 +- grepWinNP3/.editorconfig | 4 ++-- grepWinNP3/src/Resources/grepWin.rc | 17 ++++++++++------- grepWinNP3/src/last/version.h | 10 +++++----- grepWinNP3/src/resource.h | Bin 15436 -> 7547 bytes res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 2 +- 7 files changed, 20 insertions(+), 17 deletions(-) diff --git a/Versions/build.txt b/Versions/build.txt index 00750edc0..b8626c4cf 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -3 +4 diff --git a/grepWinNP3/.editorconfig b/grepWinNP3/.editorconfig index 5a252c432..15fd032c6 100644 --- a/grepWinNP3/.editorconfig +++ b/grepWinNP3/.editorconfig @@ -28,7 +28,7 @@ charset = utf-8 charset = utf-8-sig [**.{rc}] -charset = utf-16 +charset = latin1 [src/resource.h] -charset = utf-16 +charset = latin1 diff --git a/grepWinNP3/src/Resources/grepWin.rc b/grepWinNP3/src/Resources/grepWin.rc index 85ea15d42..14fa7cb52 100644 --- a/grepWinNP3/src/Resources/grepWin.rc +++ b/grepWinNP3/src/Resources/grepWin.rc @@ -1,5 +1,5 @@ // Microsoft Visual C++ generated resource script. -// +// encoding: CP-1252 #include "..\resource.h" #define APSTUDIO_READONLY_SYMBOLS @@ -21,6 +21,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#pragma code_page(1252) ///////////////////////////////////////////////////////////////////////////// // @@ -36,10 +37,11 @@ IDI_GREPWIN ICON "grepWinNP3.ico" ///////////////////////////////////////////////////////////////////////////// -// Englisch (USA) resources +// English (United States) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) ///////////////////////////////////////////////////////////////////////////// // @@ -159,8 +161,8 @@ BEGIN ICON IDI_GREPWIN,IDC_STATIC,17,18,20,20,SS_CENTERIMAGE LTEXT "",IDC_VERSIONINFO,50,18,206,8 LTEXT "",IDC_DATE,50,30,206,8 - LTEXT "Notepad3's grepWin(NP3)-mod of Stefan Küng's great tool!",IDC_NP3_DISCLAIMER,50,47,198,8 - LTEXT "Visit Stefan Küng's website",IDC_WEBLINK,50,68,150,8 + LTEXT "Notepad3's grepWin(NP3)-mod of Stefan K\xFCng's great tool!",IDC_NP3_DISCLAIMER,50,47,198,8 + LTEXT "Visit Stefan K\xFCng's website",IDC_WEBLINK,50,68,150,8 END IDD_MULTILINEEDIT DIALOGEX 0, 0, 317, 135 @@ -399,15 +401,16 @@ BEGIN IDS_ERR_PATHNOTEXIST "Path does not exist or is not accessible!" END -#endif // Englisch (USA) resources +#endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// -// Deutsch (Schweiz) resources +// German (Switzerland) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DES) LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_SWISS +#pragma code_page(1252) #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -438,7 +441,7 @@ END #endif // APSTUDIO_INVOKED -#endif // Deutsch (Schweiz) resources +#endif // German (Switzerland) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/grepWinNP3/src/last/version.h b/grepWinNP3/src/last/version.h index d14b6a6f3..9d34b8bea 100644 --- a/grepWinNP3/src/last/version.h +++ b/grepWinNP3/src/last/version.h @@ -6,13 +6,13 @@ //#pragma message(__LOC__"Run the NAnt script to get proper version info") -#define FILEVER 2, 1, 0, 7 -#define PRODUCTVER 2, 1, 0, 7 -#define STRFILEVER "2.1.0.7\0" -#define STRPRODUCTVER "2.1.0.7\0" +#define FILEVER 2, 1, 0, 8 +#define PRODUCTVER 2, 1, 0, 8 +#define STRFILEVER "2.1.0.8\0" +#define STRPRODUCTVER "2.1.0.8\0" #define GREPWIN_VERMAJOR 2 #define GREPWIN_VERMINOR 1 #define GREPWIN_VERMICRO 0 -#define GREPWIN_VERBUILD 7 +#define GREPWIN_VERBUILD 8 #define GREPWIN_VERDATE "2020-05-04" diff --git a/grepWinNP3/src/resource.h b/grepWinNP3/src/resource.h index d8b6ce3a11bfb58992051742ef04662216ba4e62..20e9be7f8eab87fd1db29c119ebd048cc1eef0ff 100644 GIT binary patch literal 7547 zcmai(TW{M)5{2LMD+tWvU?yrwo@D2ZB3l+A-j)~3UKk)8o6c%s$bm02vk2zD?>=YRkG;p0aqI^MrLzdk>{IakNm_q!*@ z`}t?*YkjI;?%wJL=Xkn*dVi>$$KzA|tMKJ3{`Jd$9sl>+>f6inf9m_U*W2pr@$KL5 zUvA^)xBA=N!|L|yOa1L|JjLni_VwldHmhHs-(T+Q*Zx0#eYqE7_38fk;duJ`yW^$5 zsO81-!%q+OjoUcD`p(9(#(q*X4#)Zs2C=3WlwyrryAlM#n!zb$YMfU|9Nr`odwo!pV%;#R zA}Yfon0X-aHFZO-Z<5jyuFeP6E!25l>|AT2sU_>C|5>_Wk@POoRV`UJ_Ig`RbSsjSt&LA=$-3n_)LtREQzTR0 z)sl4!;%$P8)Zu7uxKm40H@|9a`QfaQ;0?88-4I@1XIYXB*2WuV{VLO!$Vaq@5gG2( ziZ$K@v74DqVIbiHv3~W#KDpw2XnaWahPCll5$ji*B-ux9w$DdoxKk_6oyKkuU%6r6 z4^Vf*tXFOJX_A(9nbnH(ED!#5ehwfut3+eFY7#TfNh#l{pZznl{*UW;#rfMbC~b?F z_+YZxkMnHBxo&Cay}Ph$vVJx6Cuvp#)!wKT*M(Hi1Q{NgmAWVjOt03#sg+qnd4=Uj z;#=loF+OE|bf^gQHqe&b;d*OpUIsQVIkn~*O0X_E1jWuqt2Nh!uxMt58^rJ$y#iI; z2STkm*S#dYITtsz=KSqhThP>+b5huC5NcaJtF@Usd1bOw+iGp*L(675$E?+lXuPU5 z=Y!a7*{N0Nwq}j5BP=$~B)nR)ZW3EGKWo{k3)XGu)e?-+)#grJux{wR=&PYy1Xp^h ziJGiEh3#5YHD_73G)pcsH<||lUZ@M!%?(5G^bE_oZCr0(rp*YEVZ1g`7pz;p3$}%< zDyNfM;{)p^4$N14ZSd3u>*k}UquzJ{)uI?1>n1UiSjpP?P60GCqM#`C8c0ts7AQoBDak;bwiE-{k0%Ky0h`4q3QDsIC+Rj=W(6;^q)c1$vwa#Yvw{Y^ zolYQt&H9sl7c7TC6j%xnFe_+Sp7l?_tl)lQuM!y|U{@;xlaz`c{AtTdEK+$GNjCQ}ql7%yE|WbJIK8bfCWhbDX_q_tW-V zBJlv2<1CUi(^Nd4Cvh}kXS;4OJTQ`R|N1p#hG{j<`gZ9?PoG)JOE||(G7Ls>#b{9 ze*$JvhNYijvA+e(ac=vpedz_5L)Xmk%ib1Wap=dPYc1QG!3^G%MUljcO?FR!xl(pI zOxqXc{0x>A!LXT|{J;$McG}xdp#C=ivw}MJ_WIoM!VEUun1m3PS?=yIt^Z}Z&R~?( zF3L)R`Uk+A8~w7i2h8gXmN;9xBHjYbtAeq~%$)(uS=a6+y=dCV#hn@4^^CdM7UpK& zT5c8+VvPR4GQ)X+J&$MC8!$JS7M@7g*$2#((r@!^X^LZP&gW*IgtJR>cCh@3vo3Vw z%hJ8H_GnnE|nC)(q2LuZ*qF$R)1$)?*N`P6x zzF=)LJz!Q4pOvuI$i2`FB94W``7Vv_8& zFaLg`|B$0^>GoBAgI#Wz58sRMkxxEERngWn+!$}i{A)=GIRcWDnWrn9AeTdfP{!;z rve;EeZtOGK1bh_Uq~jt>!U+v6#{wH+3`I{3BTHnPT%R6}kNxF;7I(g8 literal 15436 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 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 0a1038493..3023508ac 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 BETA diff --git a/src/VersionEx.h b/src/VersionEx.h index 9ca0c707c..5e7032c69 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,7 +9,7 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 20 #define VERSION_REV 504 -#define VERSION_BUILD 3 +#define VERSION_BUILD 4 #define SCINTILLA_VER 433 #define ONIGURUMA_REGEX_VER 6.9.5 #define UCHARDET_VER 2018.09.27