diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..9f829cffb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*.vcxproj.user
+/.vs
+/bin/Win32
+/bin/x64
+/bin/obj
+/src/_version.h
diff --git a/Notepad2e.sln b/Notepad2e.sln
index c1e30675e..e6b9e465d 100644
--- a/Notepad2e.sln
+++ b/Notepad2e.sln
@@ -31,9 +31,7 @@ Global
{A3852498-51BF-4A24-B720-F69D2E5E6403}.Debug|x86.ActiveCfg = Debug|Win32
{A3852498-51BF-4A24-B720-F69D2E5E6403}.Debug|x86.Build.0 = Debug|Win32
{A3852498-51BF-4A24-B720-F69D2E5E6403}.Release|x64.ActiveCfg = Release|x64
- {A3852498-51BF-4A24-B720-F69D2E5E6403}.Release|x64.Build.0 = Release|x64
{A3852498-51BF-4A24-B720-F69D2E5E6403}.Release|x86.ActiveCfg = Release|Win32
- {A3852498-51BF-4A24-B720-F69D2E5E6403}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Notepad2e.vcxproj b/Notepad2e.vcxproj
index 04762c197..e62bfdf6f 100644
--- a/Notepad2e.vcxproj
+++ b/Notepad2e.vcxproj
@@ -24,196 +24,97 @@
Notepad2e
-
+
Application
Unicode
- v141_xp
+ v141_xp
+ v140_xp
-
- Application
- Unicode
- v141_xp
-
-
- Application
- Unicode
- v141_xp
+
+ true
-
- Application
- Unicode
- v141_xp
+
+ false
+ true
-
-
-
-
-
-
-
-
-
-
+
- <_ProjectFileVersion>10.0.30319.1
- $(SolutionDir)bin\$(Platform)\$(Configuration)\
- $(SolutionDir)bin\obj\$(Platform)\$(Configuration)\
- false
- false
+ $(SolutionDir)bin\$(Platform)\$(Configuration)\
$(SolutionDir)bin\
- $(SolutionDir)bin\obj\$(Platform)\$(Configuration)\
- false
- false
- AllRules.ruleset
- AllRules.ruleset
-
-
-
-
- AllRules.ruleset
- AllRules.ruleset
-
-
-
-
- $(ProjectName)
- $(ProjectName)
-
-
- false
- $(VC_IncludePath);$(WindowsSdk_71A_IncludePath)
-
-
+ $(SolutionDir)bin\obj\$(Platform)\$(Configuration)\
+ false
+ AllRules.ruleset
+
+
+ $(ProjectName)
false
- $(SolutionDir)bin\$(Platform)\$(Configuration)\
- $(SolutionDir)obj\$(Platform)\$(Configuration)\
- $(VC_IncludePath);$(WindowsSdk_71A_IncludePath)
-
- false
- $(VC_IncludePath);$(WindowsSdk_71A_IncludePath)
-
-
- false
- $(SolutionDir)bin\$(Platform)\$(Configuration)\
- $(SolutionDir)obj\$(Platform)\$(Configuration)\
- $(VC_IncludePath);$(WindowsSdk_71A_IncludePath)
-
-
+
- Disabled
scintilla\include;scintilla\src;scintilla\lexlib;scintilla\win32;$(BOOST_ROOT);$(ProjectDir)src;$(ProjectDir)src\Extension;%(AdditionalIncludeDirectories)
- _CRT_SECURE_NO_WARNINGS;STATIC_BUILD;SCI_LEXER;SCI_OWNREGEX;_DEBUG;WIN32;_WINDOWS;UNICODE;_UNICODE;_M_IX86;%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebug
-
-
+ _CRT_SECURE_NO_WARNINGS;STATIC_BUILD;SCI_LEXER;SCI_OWNREGEX;%(PreprocessorDefinitions)
+ NotUsing
Level3
- EditAndContinue
+ true
+ true
+ true
comctl32.lib;shlwapi.lib;imm32.lib;%(AdditionalDependencies)
$(SolutionDir)bin\$(Platform)\$(Configuration)\$(TargetName)$(TargetExt)
true
- $(OutDir)Notepad2.pdb
+ $(OutDir)$(TargetName).pdb
Windows
- MachineX86
$(BOOST_ROOT)\stage\lib;%(AdditionalLibraryDirectories)
/LARGEADDRESSAWARE %(AdditionalOptions)
+ MachineX86
+ MachineX64
- _DEBUG;_M_IX86;%(PreprocessorDefinitions)
+ 0x0409
+ _WIN64;%(PreprocessorDefinitions)
-
+
Disabled
- scintilla\include;scintilla\src;scintilla\lexlib;scintilla\win32;$(BOOST_ROOT);$(ProjectDir)src;$(ProjectDir)src\Extension;%(AdditionalIncludeDirectories)
- _CRT_SECURE_NO_WARNINGS;STATIC_BUILD;SCI_LEXER;SCI_OWNREGEX;_DEBUG;WIN32;_WINDOWS;UNICODE;_UNICODE;_M_IX86;%(PreprocessorDefinitions)
+ _DEBUG;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebug
-
-
- Level3
- ProgramDatabase
-
-
- comctl32.lib;shlwapi.lib;imm32.lib;%(AdditionalDependencies)
- $(SolutionDir)bin\$(Platform)\$(Configuration)\$(TargetName)$(TargetExt)
- true
- $(OutDir)Notepad2.pdb
- Windows
- $(BOOST_ROOT)\stage\lib;%(AdditionalLibraryDirectories)
-
-
- _DEBUG;_M_IX86;%(PreprocessorDefinitions)
-
-
-
-
- MaxSpeed
- OnlyExplicitInline
- true
- scintilla\include;scintilla\src;scintilla\lexlib;scintilla\win32;$(BOOST_ROOT);$(ProjectDir)src;$(ProjectDir)src\Extension;%(AdditionalIncludeDirectories)
- _CRT_SECURE_NO_WARNINGS;STATIC_BUILD;SCI_LEXER;SCI_OWNREGEX;NDEBUG;WIN32;_WINDOWS;UNICODE;_UNICODE;_M_IX86;%(PreprocessorDefinitions)
- true
- MultiThreaded
- true
-
-
- Level3
-
-
+ EditAndContinue
+ true
-
- comctl32.lib;shlwapi.lib;imm32.lib;%(AdditionalDependencies)
- $(SolutionDir)bin\$(TargetName)$(TargetExt)
- false
- Windows
- true
- true
- MachineX86
- $(BOOST_ROOT)\stage\lib;%(AdditionalLibraryDirectories)
- /LARGEADDRESSAWARE %(AdditionalOptions)
-
- NDEBUG;_M_IX86;%(PreprocessorDefinitions)
+ _DEBUG;%(PreprocessorDefinitions)
-
+
MaxSpeed
- OnlyExplicitInline
+ NDEBUG;%(PreprocessorDefinitions)
true
- scintilla\include;scintilla\src;scintilla\lexlib;scintilla\win32;$(BOOST_ROOT);$(ProjectDir)src;$(ProjectDir)src\Extension;%(AdditionalIncludeDirectories)
- _CRT_SECURE_NO_WARNINGS;STATIC_BUILD;SCI_LEXER;SCI_OWNREGEX;NDEBUG;WIN32;_WINDOWS;UNICODE;_UNICODE;_M_IX86;%(PreprocessorDefinitions)
true
MultiThreaded
true
-
-
- Level3
-
-
+ true
+ true
+ UseLinkTimeCodeGeneration
- comctl32.lib;shlwapi.lib;imm32.lib;%(AdditionalDependencies)
- $(SolutionDir)bin\$(Platform)\$(Configuration)\$(TargetName)$(TargetExt)
+ $(SolutionDir)bin\$(TargetName)$(TargetExt)
false
- Windows
true
true
- $(BOOST_ROOT)\stage\lib;%(AdditionalLibraryDirectories)
+ true
- NDEBUG;_M_IX86;%(PreprocessorDefinitions)
+ NDEBUG;%(PreprocessorDefinitions)
@@ -333,10 +234,7 @@
-
- NotUsing
- NotUsing
-
+
@@ -480,14 +378,8 @@
- $(SolutionDir)src\Extension\printtime.bat %(FullPath)
- $(SolutionDir)src\Extension\printtime.bat %(FullPath)
- $(SolutionDir)src\Extension\printtime.bat %(FullPath)
- $(SolutionDir)src\Extension\printtime.bat %(FullPath)
- print build time
- print build time
- 111
- 111
+ $(SolutionDir)src\Extension\printtime.bat %(FullPath)
+ print build time
diff --git a/Notepad2e.vcxproj.filters b/Notepad2e.vcxproj.filters
new file mode 100644
index 000000000..70731fb71
--- /dev/null
+++ b/Notepad2e.vcxproj.filters
@@ -0,0 +1,874 @@
+
+
+
+
+ {534848c8-5f8f-4951-8e3d-1d5e1a28c9b3}
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hh;hpp;hxx;hm;inl;inc;ipp;xsd
+
+
+ {d304ec80-1ef3-4c77-a0b7-dae946b86ffa}
+
+
+ {2390f6c5-569e-4f95-bbb7-dbf43bd52eb1}
+
+
+ {86231ac2-a3f2-4125-8484-1fbc506db469}
+
+
+ {0b003dcb-6158-4f10-b0a5-7873f3c32f32}
+
+
+ {7fdd770b-a03c-4bd3-90a2-d58518468693}
+
+
+ {43f0118a-5216-4f42-aa7e-2c5184c64d72}
+
+
+ {6b8a3dd3-2c58-471c-a8d9-fe81c726c135}
+
+
+ {74b1feda-e7a1-4be8-af31-d152307a4223}
+
+
+ {8595dcce-9c22-4a87-a7a2-08fe76b8a167}
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ scintilla\lexlib
+
+
+ scintilla\lexlib
+
+
+ scintilla\lexlib
+
+
+ scintilla\lexlib
+
+
+ scintilla\lexlib
+
+
+ scintilla\src
+
+
+ scintilla\lexlib
+
+
+ scintilla\include
+
+
+ scintilla\lexlib
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\include
+
+
+ scintilla\include
+
+
+ scintilla\src
+
+
+ scintilla\win32
+
+
+ scintilla\lexlib
+
+
+ scintilla\lexlib
+
+
+ scintilla\src
+
+
+ scintilla\lexlib
+
+
+ scintilla\src
+
+
+ scintilla\lexlib
+
+
+ scintilla\lexlib
+
+
+ scintilla\lexlib
+
+
+ scintilla\lexlib
+
+
+ scintilla\lexlib
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\win32
+
+
+ scintilla\include
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\include
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ Header Files\Extension
+
+
+ Header Files\Extension
+
+
+ Header Files\Extension
+
+
+ Header Files\Extension
+
+
+ Header Files\Extension
+
+
+ Header Files\Extension
+
+
+ Header Files\Extension
+
+
+ Header Files\Extension
+
+
+ Header Files\Extension
+
+
+ Header Files\Extension
+
+
+ Header Files\Extension
+
+
+ Header Files\Extension
+
+
+ Header Files\Extension
+
+
+ Header Files\Extension
+
+
+ Header Files\Extension
+
+
+ Header Files\Extension
+
+
+ scintilla\boostregexp
+
+
+ Header Files\Extension
+
+
+ scintilla\boostregexp
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexers
+
+
+ scintilla\lexlib
+
+
+ scintilla\lexlib
+
+
+ scintilla\lexlib
+
+
+ scintilla\lexlib
+
+
+ scintilla\lexlib
+
+
+ scintilla\lexers
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\lexlib
+
+
+ scintilla\win32
+
+
+ scintilla\win32
+
+
+ scintilla\lexlib
+
+
+ scintilla\lexlib
+
+
+ scintilla\win32
+
+
+ scintilla\lexlib
+
+
+ scintilla\win32
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ scintilla\src
+
+
+ Source Files\Extension
+
+
+ Source Files\Extension
+
+
+ Source Files\Extension
+
+
+ Source Files\Extension\tinyexpr
+
+
+ Source Files\Extension
+
+
+ Source Files\Extension
+
+
+ Source Files\Extension
+
+
+ Source Files\Extension
+
+
+ Source Files\Extension
+
+
+ Source Files\Extension
+
+
+ Source Files\Extension
+
+
+ Source Files\Extension
+
+
+ Source Files\Extension
+
+
+ Source Files\Extension
+
+
+ Source Files
+
+
+ Source Files
+
+
+ scintilla\boostregexp
+
+
+ scintilla\boostregexp
+
+
+
+
+ Resource Files
+
+
+
+
+
+
+
+ Header Files
+
+
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Resource Files
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff --git a/src/Extension/EditHelper.c b/src/Extension/EditHelper.c
index 00ffc06c4..8c0bd1a93 100644
--- a/src/Extension/EditHelper.c
+++ b/src/Extension/EditHelper.c
@@ -1112,7 +1112,7 @@ LRESULT n2e_OpenDialogWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam
BOOL n2e_SubclassOpenDialog(const HWND hwnd)
{
- SetProp(hwnd, PROPERTY_ORIGINAL_WINDOW_PROC, (HANDLE)SetWindowLongPtr(hwnd, GWLP_WNDPROC, (long)n2e_OpenDialogWndProc));
+ SetProp(hwnd, PROPERTY_ORIGINAL_WINDOW_PROC, (HANDLE)SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)n2e_OpenDialogWndProc));
return TRUE;
}
diff --git a/src/Extension/EditHelperEx.cpp b/src/Extension/EditHelperEx.cpp
index 5c8c3e0fa..007d912af 100644
--- a/src/Extension/EditHelperEx.cpp
+++ b/src/Extension/EditHelperEx.cpp
@@ -131,7 +131,7 @@ extern "C"
HMENU h_menu = CreatePopupMenu();
pContextMenu->QueryContextMenu(h_menu, 0, 1, 0x7FFF, iShellMenuType);
- WNDPROC OldWndProc = NULL;
+ LONG_PTR OldWndProc = NULL;
OSVERSIONINFOEX osvi;
ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
@@ -143,8 +143,8 @@ extern "C"
N2E_TRACE_PLAIN("win version %d (%d - %d) . XP ? : %d", WINVER, osvi.dwMajorVersion, osvi.dwMinorVersion, !bIsWindowsXPorLater);
if (iMenuType > 1) // only version 2 and 3 supports menu messages
{
- OldWndProc = (WNDPROC)SetWindowLong(hwndParent,
- GWL_WNDPROC, (DWORD)HookWndProc);
+ OldWndProc = SetWindowLongPtr(hwndParent,
+ GWLP_WNDPROC, (LONG_PTR)HookWndProc);
if (iMenuType == 2)
{
g_IContext2 = (LPCONTEXTMENU2)pContextMenu;
@@ -164,7 +164,7 @@ extern "C"
Invoke(iCmd, pContextMenu, hwndParent, path);
if (OldWndProc)
{
- SetWindowLong(hwndParent, GWL_WNDPROC, (DWORD)OldWndProc);
+ SetWindowLongPtr(hwndParent, GWLP_WNDPROC, OldWndProc);
}
pContextMenu->Release();
return TRUE;
diff --git a/src/Extension/Utils.c b/src/Extension/Utils.c
index 69f0eb783..050f4ffc1 100644
--- a/src/Extension/Utils.c
+++ b/src/Extension/Utils.c
@@ -507,7 +507,7 @@ UINT_PTR CALLBACK n2e_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM l
PathRemoveFileSpec(dir);
}
}
- SetWindowLong(hdlg, DWL_MSGRESULT, 1);
+ SetWindowLongPtr(hdlg, DWLP_MSGRESULT, 1);
N2E_TRACE("OFN OK '%S' ", buf);
if (len)
{
@@ -542,7 +542,7 @@ UINT_PTR CALLBACK n2e_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM l
lstrcpy(ofn->lpOFN->lpstrFile, out);
}
N2E_TRACE("OFN final result (%S) ", out);
- SetWindowLong(hdlg, DWL_MSGRESULT, 0);
+ SetWindowLongPtr(hdlg, DWLP_MSGRESULT, 0);
take_call = FALSE;
return 1;
}
@@ -590,7 +590,7 @@ UINT_PTR CALLBACK n2e_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM l
if (file_ok == uiMsg)
{
N2E_TRACE("custom OK");
- SetWindowLong(hdlg, DWL_MSGRESULT, take_call);
+ SetWindowLongPtr(hdlg, DWLP_MSGRESULT, take_call);
}
}
return take_call;
diff --git a/src/version.h b/src/version.h
index c656a7646..449d06d2d 100644
--- a/src/version.h
+++ b/src/version.h
@@ -23,7 +23,7 @@
#define VERSION_FILEVERSION_SHORT L"4.2.25"
#define VERSION_LEGALCOPYRIGHT_SHORT L"Copyright � 2004-2011"
#define VERSION_LEGALCOPYRIGHT_LONG L"� Florian Balmer 2004-2011"
-#ifdef _M_AMD64
+#ifdef _WIN64
#define VERSION_FILEDESCRIPTION L"Notepad 2e x64"
#else
#define VERSION_FILEDESCRIPTION L"Notepad 2e"
diff --git a/test/Extension/Notepad2eTests.vcxproj b/test/Extension/Notepad2eTests.vcxproj
index b2b45a3d0..8a66dc40d 100644
--- a/test/Extension/Notepad2eTests.vcxproj
+++ b/test/Extension/Notepad2eTests.vcxproj
@@ -24,77 +24,43 @@
Notepad2eTests
-
+
DynamicLibrary
- true
- v141_xp
- Unicode
- false
-
-
- DynamicLibrary
- false
- v141_xp
- true
+ v141_xp
+ v140_xp
Unicode
false
-
- DynamicLibrary
+
true
- v141_xp
- Unicode
- false
-
- DynamicLibrary
+
false
- v141_xp
true
- Unicode
- false
-
-
-
-
-
-
-
-
-
-
+
-
- true
- $(SolutionDir)bin\obj\$(Platform)\$(Configuration)\test\
- $(SolutionDir)bin\$(Platform)\$(Configuration)\
-
-
- true
-
-
- true
+
$(SolutionDir)bin\obj\$(Platform)\$(Configuration)\test\
$(SolutionDir)bin\$(Platform)\$(Configuration)\
-
+
true
-
+
Use
Level3
- Disabled
$(VCInstallDir)UnitTest\include;../../src/;../../scintilla/include;%(AdditionalIncludeDirectories)
- WIN32;N2E_TESTING;_DEBUG;%(PreprocessorDefinitions)
+ N2E_TESTING;_DEBUG;%(PreprocessorDefinitions)
+ WIN32;%(PreprocessorDefinitions)
true
@@ -103,55 +69,22 @@
Shlwapi.lib;%(AdditionalDependencies)
-
+
- Use
- Level3
Disabled
- $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
_DEBUG;%(PreprocessorDefinitions)
- true
-
- Windows
- $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)
-
-
+
- Level3
- Use
MaxSpeed
true
true
- $(VCInstallDir)UnitTest\include;../../src/;../../scintilla/include;%(AdditionalIncludeDirectories)
- WIN32;N2E_TESTING;NDEBUG;%(PreprocessorDefinitions)
- true
-
-
- Windows
- true
- true
- $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)
- kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Shlwapi.lib;%(AdditionalDependencies)
-
-
-
-
- Level3
- Use
- MaxSpeed
- true
- true
- $(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
NDEBUG;%(PreprocessorDefinitions)
- true
- Windows
true
true
- $(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)
@@ -167,53 +100,38 @@
- CompileAsC
- CompileAsC
- NotUsing
- NotUsing
+ NotUsing
+ CompileAsC
- NotUsing
- NotUsing
+ NotUsing
- NotUsing
- NotUsing
+ NotUsing
- NotUsing
- NotUsing
+ NotUsing
- NotUsing
- NotUsing
- CompileAsC
- CompileAsC
+ NotUsing
+ CompileAsC
- NotUsing
- NotUsing
- CompileAsC
- CompileAsC
+ NotUsing
+ CompileAsC
- NotUsing
- NotUsing
+ NotUsing
- NotUsing
- NotUsing
+ NotUsing
- NotUsing
- NotUsing
+ NotUsing
- Create
- Create
- Create
- Create
+ Create