From 901effde375f08e26ec3f2e05687a45bd060a40d Mon Sep 17 00:00:00 2001 From: "Vladimir.Orlov" Date: Thu, 19 Nov 2015 15:40:55 +0300 Subject: [PATCH] IDEA-148058 Visual Studio cleanup in tools/idea/native. --- native/IdeaWin32/IdeaWin32.vcxproj | 14 +- .../VistaUpdaterLauncher.sln | 7 +- .../VistaUpdaterLauncher.vcxproj | 104 +++++++++++ .../VistaUpdaterLauncher.vcxproj.filters | 41 +++++ .../WinLauncher/WinLauncher.vcxproj | 8 +- native/breakgen/breakgen.sln | 7 +- native/breakgen/breakgen.vcxproj | 157 +++++++++++++++++ native/breakgen/breakgen.vcxproj.filters | 22 +++ native/fileWatcher/fileWatcher3.vcxproj | 6 +- native/focusKiller/HookImportFunction.cpp | 3 +- native/focusKiller/focusKiller.sln | 7 +- native/focusKiller/focusKiller.vcxproj | 165 ++++++++++++++++++ .../focusKiller/focusKiller.vcxproj.filters | 30 ++++ native/jumplistbridge/JumpListBridge.sln | 26 +++ native/jumplistbridge/JumpListBridge.vcxproj | 148 ++++++++++++++++ .../JumpListBridge.vcxproj.filters | 36 ++++ native/jumplistbridge/jumplistbridge.cpp | 4 +- native/jumplistbridge/stdafx.cpp | 8 + native/jumplistbridge/stdafx.h | 21 +++ native/jumplistbridge/targetver.h | 8 + native/restarter/restarter.sln | 5 +- native/restarter/restarter.vcxproj | 100 +++++++++++ native/restarter/restarter.vcxproj.filters | 36 ++++ native/runner/runnerw/runnerw.vcxproj | 5 +- 24 files changed, 934 insertions(+), 34 deletions(-) create mode 100644 native/VistaUpdaterLauncher/VistaUpdaterLauncher/VistaUpdaterLauncher.vcxproj create mode 100644 native/VistaUpdaterLauncher/VistaUpdaterLauncher/VistaUpdaterLauncher.vcxproj.filters create mode 100644 native/breakgen/breakgen.vcxproj create mode 100644 native/breakgen/breakgen.vcxproj.filters create mode 100644 native/focusKiller/focusKiller.vcxproj create mode 100644 native/focusKiller/focusKiller.vcxproj.filters create mode 100644 native/jumplistbridge/JumpListBridge.sln create mode 100644 native/jumplistbridge/JumpListBridge.vcxproj create mode 100644 native/jumplistbridge/JumpListBridge.vcxproj.filters create mode 100644 native/jumplistbridge/stdafx.cpp create mode 100644 native/jumplistbridge/stdafx.h create mode 100644 native/jumplistbridge/targetver.h create mode 100644 native/restarter/restarter.vcxproj create mode 100644 native/restarter/restarter.vcxproj.filters diff --git a/native/IdeaWin32/IdeaWin32.vcxproj b/native/IdeaWin32/IdeaWin32.vcxproj index bdf7114484b6..584b492f3357 100644 --- a/native/IdeaWin32/IdeaWin32.vcxproj +++ b/native/IdeaWin32/IdeaWin32.vcxproj @@ -28,27 +28,23 @@ DynamicLibrary true Unicode - Windows7.1SDK DynamicLibrary true Unicode - Windows7.1SDK DynamicLibrary false true Unicode - Windows7.1SDK DynamicLibrary false true Unicode - Windows7.1SDK @@ -82,12 +78,12 @@ false - $(Configuration)$(Platform)\ + ..\..\bin\win IdeaWin32 false - $(Configuration)$(Platform)\ + ..\..\bin\win IdeaWin64 @@ -97,6 +93,7 @@ Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;IDEAWIN32_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDebug + $(JdkPath)\include;$(JdkPath)\include\win32;%(AdditionalIncludeDirectories) Windows @@ -110,6 +107,7 @@ Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;IDEAWIN32_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDebug + $(JdkPath)\include;$(JdkPath)\include\win32;%(AdditionalIncludeDirectories) Windows @@ -125,6 +123,7 @@ true WIN32;NDEBUG;_WINDOWS;_USRDLL;IDEAWIN32_EXPORTS;%(PreprocessorDefinitions) MultiThreaded + $(JdkPath)\include;$(JdkPath)\include\win32;%(AdditionalIncludeDirectories) Windows @@ -142,6 +141,7 @@ true WIN32;NDEBUG;_WINDOWS;_USRDLL;IDEAWIN32_EXPORTS;%(PreprocessorDefinitions) MultiThreaded + $(JdkPath)\include;$(JdkPath)\include\win32;%(AdditionalIncludeDirectories) Windows @@ -159,4 +159,4 @@ - \ No newline at end of file + diff --git a/native/VistaUpdaterLauncher/VistaUpdaterLauncher.sln b/native/VistaUpdaterLauncher/VistaUpdaterLauncher.sln index b52fb618c7d4..6735965124e5 100644 --- a/native/VistaUpdaterLauncher/VistaUpdaterLauncher.sln +++ b/native/VistaUpdaterLauncher/VistaUpdaterLauncher.sln @@ -1,7 +1,6 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VistaUpdaterLauncher", "VistaUpdaterLauncher\VistaUpdaterLauncher.vcproj", "{05040CA8-09AC-48F2-89BE-1A271F97FE58}" +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VistaUpdaterLauncher", "VistaUpdaterLauncher\VistaUpdaterLauncher.vcxproj", "{05040CA8-09AC-48F2-89BE-1A271F97FE58}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/native/VistaUpdaterLauncher/VistaUpdaterLauncher/VistaUpdaterLauncher.vcxproj b/native/VistaUpdaterLauncher/VistaUpdaterLauncher/VistaUpdaterLauncher.vcxproj new file mode 100644 index 000000000000..a32708c678e7 --- /dev/null +++ b/native/VistaUpdaterLauncher/VistaUpdaterLauncher/VistaUpdaterLauncher.vcxproj @@ -0,0 +1,104 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {05040CA8-09AC-48F2-89BE-1A271F97FE58} + VistaUpdaterLauncher + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + ..\..\..\bin\win + $(Configuration)\ + false + vistalauncher + + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreaded + Use + Level3 + EditAndContinue + + + RequireAdministrator + true + Console + MachineX86 + + + + + MaxSpeed + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Use + Level3 + ProgramDatabase + + + RequireAdministrator + true + Console + true + true + MachineX86 + + + + + Create + Create + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/native/VistaUpdaterLauncher/VistaUpdaterLauncher/VistaUpdaterLauncher.vcxproj.filters b/native/VistaUpdaterLauncher/VistaUpdaterLauncher/VistaUpdaterLauncher.vcxproj.filters new file mode 100644 index 000000000000..2810e48c6ccd --- /dev/null +++ b/native/VistaUpdaterLauncher/VistaUpdaterLauncher/VistaUpdaterLauncher.vcxproj.filters @@ -0,0 +1,41 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/native/WinLauncher/WinLauncher/WinLauncher.vcxproj b/native/WinLauncher/WinLauncher/WinLauncher.vcxproj index 812ad622c9ab..309ea952de8e 100644 --- a/native/WinLauncher/WinLauncher/WinLauncher.vcxproj +++ b/native/WinLauncher/WinLauncher/WinLauncher.vcxproj @@ -65,18 +65,23 @@ true $(JdkPath)\include;$(JdkPath)\include\win32;$(IncludePath) + ..\..\..\bin\WinLauncher true $(JdkPath)\include;$(JdkPath)\include\win32;$(IncludePath) + $(ProjectName)64 false - $(JdkPath)\include;$(JdkPath)\include\win32;$(IncludePath) + C:\Program Files %28x86%29\Java\jdk1.8.0_20\include;C:\Program Files %28x86%29\Java\jdk1.8.0_20\include\win32;$(IncludePath) false $(JdkPath)\include;$(JdkPath)\include\win32;$(IncludePath) + $(ProjectName)64 + ..\..\..\bin\WinLauncher + C:\Program Files\Java\jdk1.8.0_65\include;C:\Program Files\Java\jdk1.8.0_65\include\win32;$(IncludePath) @@ -143,7 +148,6 @@ true true true - $(OutDir)WinLauncher64.exe true diff --git a/native/breakgen/breakgen.sln b/native/breakgen/breakgen.sln index 385ab273014d..c95280945f2d 100644 --- a/native/breakgen/breakgen.sln +++ b/native/breakgen/breakgen.sln @@ -1,7 +1,6 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "breakgen", "breakgen.vcproj", "{AE14C87F-E99B-4363-BE34-917FAF98258F}" +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "breakgen", "breakgen.vcxproj", "{AE14C87F-E99B-4363-BE34-917FAF98258F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/native/breakgen/breakgen.vcxproj b/native/breakgen/breakgen.vcxproj new file mode 100644 index 000000000000..142d26a13fa0 --- /dev/null +++ b/native/breakgen/breakgen.vcxproj @@ -0,0 +1,157 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {AE14C87F-E99B-4363-BE34-917FAF98258F} + breakgen + Win32Proj + + + + DynamicLibrary + + + DynamicLibrary + + + DynamicLibrary + + + DynamicLibrary + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + Debug\ + true + ..\..\bin\win + true + $(Platform)\$(Configuration)\ + true + ..\..\bin\win + true + $(JdkPath)\include;$(IncludePath) + $(JdkPath)\include;$(IncludePath) + $(JdkPath)\include;$(IncludePath) + $(JdkPath)\include;$(IncludePath) + $(ProjectName)64 + + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;BREAKGEN_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + $(JdkPath)\include;$(JdkPath)\include\win32;%(AdditionalIncludeDirectories) + + + true + Windows + MachineX86 + + + + + $(JdkPath)\include;$(JdkPath)\include\win32;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;BREAKGEN_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + true + Windows + true + true + MachineX86 + + + + + X64 + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;BREAKGEN_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + $(JdkPath)\include;$(JdkPath)\include\win32;%(AdditionalIncludeDirectories) + + + true + Windows + MachineX64 + + + + + X64 + + + $(JdkPath)\include;$(JdkPath)\include\win32;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;BREAKGEN_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + true + Windows + true + true + MachineX64 + + + + + + + + + \ No newline at end of file diff --git a/native/breakgen/breakgen.vcxproj.filters b/native/breakgen/breakgen.vcxproj.filters new file mode 100644 index 000000000000..9c4507db840c --- /dev/null +++ b/native/breakgen/breakgen.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/native/fileWatcher/fileWatcher3.vcxproj b/native/fileWatcher/fileWatcher3.vcxproj index 1e92da2cb084..3cb451a4f3c4 100644 --- a/native/fileWatcher/fileWatcher3.vcxproj +++ b/native/fileWatcher/fileWatcher3.vcxproj @@ -26,7 +26,6 @@ Application - v120_xp Unicode true @@ -38,7 +37,6 @@ Application - v120_xp Unicode @@ -78,7 +76,7 @@ fsnotifier64 - $(SolutionDir)$(Configuration)\ + ..\..\bin\win $(Configuration)\ false fsnotifier @@ -174,4 +172,4 @@ - \ No newline at end of file + diff --git a/native/focusKiller/HookImportFunction.cpp b/native/focusKiller/HookImportFunction.cpp index ab11935a25da..5ef504f90865 100644 --- a/native/focusKiller/HookImportFunction.cpp +++ b/native/focusKiller/HookImportFunction.cpp @@ -180,7 +180,8 @@ BOOL HookImportFunctionsByName(HMODULE hModule, LPCSTR szImportMod, UINT uiCount // used so the lookup will be faster. However, the size of // uiCount coming into this function should be rather small // but it is called for each function imported by szImportMod. - for (UINT i = 0; iName[0]) && (strcmpi(paHookArray[i].szFunc, (char*)pByName->Name) == 0)) diff --git a/native/focusKiller/focusKiller.sln b/native/focusKiller/focusKiller.sln index e58b43c4c586..8dc7bcd611d2 100644 --- a/native/focusKiller/focusKiller.sln +++ b/native/focusKiller/focusKiller.sln @@ -1,7 +1,6 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "focusKiller", "focusKiller.vcproj", "{6B40296D-5F50-4606-AB84-81FA874CC25A}" +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "focusKiller", "focusKiller.vcxproj", "{6B40296D-5F50-4606-AB84-81FA874CC25A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/native/focusKiller/focusKiller.vcxproj b/native/focusKiller/focusKiller.vcxproj new file mode 100644 index 000000000000..1b129bcf0a70 --- /dev/null +++ b/native/focusKiller/focusKiller.vcxproj @@ -0,0 +1,165 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {6B40296D-5F50-4606-AB84-81FA874CC25A} + focusKiller + Win32Proj + + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + false + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + false + MultiByte + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + ..\..\bin\win + $(Configuration)\ + false + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + ..\..\bin\win + $(Platform)\$(Configuration)\ + false + $(ProjectName)64 + + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;FOCUSKILLER_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + + true + Windows + MachineX86 + + + + + WIN32;NDEBUG;_WINDOWS;_USRDLL;FOCUSKILLER_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + true + Windows + true + true + MachineX86 + + + + + X64 + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;FOCUSKILLER_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + true + Windows + MachineX64 + + + + + X64 + + + WIN32;NDEBUG;_WINDOWS;_USRDLL;FOCUSKILLER_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + true + Windows + true + true + MachineX64 + + + + + + + + + + + + + \ No newline at end of file diff --git a/native/focusKiller/focusKiller.vcxproj.filters b/native/focusKiller/focusKiller.vcxproj.filters new file mode 100644 index 000000000000..3906587afb55 --- /dev/null +++ b/native/focusKiller/focusKiller.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/native/jumplistbridge/JumpListBridge.sln b/native/jumplistbridge/JumpListBridge.sln new file mode 100644 index 000000000000..f0e2da4e2251 --- /dev/null +++ b/native/jumplistbridge/JumpListBridge.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JumpListBridge", "JumpListBridge.vcxproj", "{7D823E08-D05C-4A67-997C-09E9D19C75B2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7D823E08-D05C-4A67-997C-09E9D19C75B2}.Debug|Win32.ActiveCfg = Debug|Win32 + {7D823E08-D05C-4A67-997C-09E9D19C75B2}.Debug|Win32.Build.0 = Debug|Win32 + {7D823E08-D05C-4A67-997C-09E9D19C75B2}.Debug|x64.ActiveCfg = Debug|x64 + {7D823E08-D05C-4A67-997C-09E9D19C75B2}.Debug|x64.Build.0 = Debug|x64 + {7D823E08-D05C-4A67-997C-09E9D19C75B2}.Release|Win32.ActiveCfg = Release|Win32 + {7D823E08-D05C-4A67-997C-09E9D19C75B2}.Release|Win32.Build.0 = Release|Win32 + {7D823E08-D05C-4A67-997C-09E9D19C75B2}.Release|x64.ActiveCfg = Release|x64 + {7D823E08-D05C-4A67-997C-09E9D19C75B2}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/native/jumplistbridge/JumpListBridge.vcxproj b/native/jumplistbridge/JumpListBridge.vcxproj new file mode 100644 index 000000000000..bafec4b6bce9 --- /dev/null +++ b/native/jumplistbridge/JumpListBridge.vcxproj @@ -0,0 +1,148 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {7D823E08-D05C-4A67-997C-09E9D19C75B2} + JumpListBridge + + + + DynamicLibrary + true + Unicode + Static + + + DynamicLibrary + true + Unicode + Static + + + DynamicLibrary + false + true + Unicode + Static + + + DynamicLibrary + false + true + Unicode + Static + + + + + + + + + + + + + + + + + + + ..\..\bin\win + + + ..\..\bin\win + $(ProjectName)64 + + + + Level3 + Disabled + $(JdkPath)\include;$(JdkPath)\include\win32;%(AdditionalIncludeDirectories) + Use + + + true + shell32.lib + + + + + Level3 + Disabled + $(JdkPath)\include;$(JdkPath)\include\win32;%(AdditionalIncludeDirectories) + Use + + + true + shell32.lib + + + + + Level3 + MaxSpeed + true + true + $(JdkPath)\include;$(JdkPath)\include\win32;%(AdditionalIncludeDirectories) + Use + + + true + true + true + shell32.lib + + + + + Level3 + MaxSpeed + true + true + $(JdkPath)\include;$(JdkPath)\include\win32;%(AdditionalIncludeDirectories) + Use + + + true + true + true + shell32.lib + + + + + + + + + + + Create + Create + Create + Create + + + + + + \ No newline at end of file diff --git a/native/jumplistbridge/JumpListBridge.vcxproj.filters b/native/jumplistbridge/JumpListBridge.vcxproj.filters new file mode 100644 index 000000000000..e23766aa7811 --- /dev/null +++ b/native/jumplistbridge/JumpListBridge.vcxproj.filters @@ -0,0 +1,36 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {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 + + + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/native/jumplistbridge/jumplistbridge.cpp b/native/jumplistbridge/jumplistbridge.cpp index 4703ab5d7ee2..a1c8796ed5ed 100644 --- a/native/jumplistbridge/jumplistbridge.cpp +++ b/native/jumplistbridge/jumplistbridge.cpp @@ -21,7 +21,7 @@ #include "stdafx.h" #include #include -#include "jumplistbridge64.h" +#include "jumplistbridge.h" #include #include #include @@ -272,4 +272,4 @@ JNIEXPORT void JNICALL Java_com_intellij_ui_win_RecentTasks_addTasksNativeForCat } else { jEnv->ThrowNew(jEnv->FindClass("java/lang/Exception"), "Cannot recieve CLSID_DestinationList interface"); } -} \ No newline at end of file +} diff --git a/native/jumplistbridge/stdafx.cpp b/native/jumplistbridge/stdafx.cpp new file mode 100644 index 000000000000..7c2dc8c7f9af --- /dev/null +++ b/native/jumplistbridge/stdafx.cpp @@ -0,0 +1,8 @@ +// stdafx.cpp : source file that includes just the standard includes +// JumpListBridge.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + +// TODO: reference any additional headers you need in STDAFX.H +// and not in this file diff --git a/native/jumplistbridge/stdafx.h b/native/jumplistbridge/stdafx.h new file mode 100644 index 000000000000..bb80440ee2bd --- /dev/null +++ b/native/jumplistbridge/stdafx.h @@ -0,0 +1,21 @@ +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#pragma once + +#include "targetver.h" + +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +// Windows Header Files: +#include + +// C RunTime Header Files +#include +#include +#include +#include + + +// TODO: reference additional headers your program requires here diff --git a/native/jumplistbridge/targetver.h b/native/jumplistbridge/targetver.h new file mode 100644 index 000000000000..87c0086de751 --- /dev/null +++ b/native/jumplistbridge/targetver.h @@ -0,0 +1,8 @@ +#pragma once + +// Including SDKDDKVer.h defines the highest available Windows platform. + +// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and +// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. + +#include diff --git a/native/restarter/restarter.sln b/native/restarter/restarter.sln index 7b9e2583d41a..fbc10811a8b3 100644 --- a/native/restarter/restarter.sln +++ b/native/restarter/restarter.sln @@ -1,6 +1,5 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "restarter", "restarter.vcxproj", "{1B2485B2-CFED-4B2F-8FFD-00F1C9E1BD0C}" EndProject Global diff --git a/native/restarter/restarter.vcxproj b/native/restarter/restarter.vcxproj new file mode 100644 index 000000000000..e71ce67273ef --- /dev/null +++ b/native/restarter/restarter.vcxproj @@ -0,0 +1,100 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {1B2485B2-CFED-4B2F-8FFD-00F1C9E1BD0C} + restarter + Win32Proj + + + + Application + Unicode + true + + + Application + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + ..\..\bin\win + $(Configuration)\ + false + + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + MaxSpeed + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + true + Use + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + + Create + Create + + + + + + + + + + + + + \ No newline at end of file diff --git a/native/restarter/restarter.vcxproj.filters b/native/restarter/restarter.vcxproj.filters new file mode 100644 index 000000000000..728008dd0330 --- /dev/null +++ b/native/restarter/restarter.vcxproj.filters @@ -0,0 +1,36 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + + + + \ No newline at end of file diff --git a/native/runner/runnerw/runnerw.vcxproj b/native/runner/runnerw/runnerw.vcxproj index be49c0de94ec..373a06b0a707 100644 --- a/native/runner/runnerw/runnerw.vcxproj +++ b/native/runner/runnerw/runnerw.vcxproj @@ -18,12 +18,10 @@ Application true - v120 Application false - v120_xp @@ -40,6 +38,7 @@ true + ..\..\..\bin\win @@ -82,4 +81,4 @@ - \ No newline at end of file +