ShellExtension: Move *.cpp, *.h, *.vcxproj files to src folderShellExtension: Move...

diff --git a/ALL.vs2017.sln b/ALL.vs2017.sln
index 6dc4e18..4fe37f6 100644 (file)
--- a/ALL.vs2017.sln
+++ b/ALL.vs2017.sln
@@ -79,7 +79,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WatchBeginningOfLog", "Plug
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WatchEndOfLog", "Plugins\src_VCPP\WatchEndOfLog\WatchEndOfLog.vcxproj", "{4A3F0C35-6B6D-44B3-84FD-7E2168398361}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShellExtension", "ShellExtension\src\ShellExtension.vcxproj", "{76A538A1-9D2C-49CB-AE9F-72548CE37F88}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShellExtension", "ShellExtension\ShellExtension\ShellExtension.vcxproj", "{76A538A1-9D2C-49CB-AE9F-72548CE37F88}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinMerge32BitPluginProxy", "Plugins\WinMerge32BitPluginProxy\WinMerge32BitPluginProxy.vcxproj", "{AF985E3F-14EE-420E-90FE-AAA844797D36}"
 EndProject

diff --git a/ALL.vs2019.sln b/ALL.vs2019.sln
index 271abee..58a8c10 100644 (file)
--- a/ALL.vs2019.sln
+++ b/ALL.vs2019.sln
@@ -79,7 +79,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WatchBeginningOfLog", "Plug
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WatchEndOfLog", "Plugins\src_VCPP\WatchEndOfLog\WatchEndOfLog.vcxproj", "{4A3F0C35-6B6D-44B3-84FD-7E2168398361}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShellExtension", "ShellExtension\src\ShellExtension.vcxproj", "{76A538A1-9D2C-49CB-AE9F-72548CE37F88}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShellExtension", "ShellExtension\ShellExtension\ShellExtension.vcxproj", "{76A538A1-9D2C-49CB-AE9F-72548CE37F88}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinMerge32BitPluginProxy", "Plugins\WinMerge32BitPluginProxy\WinMerge32BitPluginProxy.vcxproj", "{AF985E3F-14EE-420E-90FE-AAA844797D36}"
 EndProject

diff --git a/ShellExtension/src/LanguageSelect.cpp b/ShellExtension/Common/LanguageSelect.cpp
similarity index 100%
rename from ShellExtension/src/LanguageSelect.cpp
rename to ShellExtension/Common/LanguageSelect.cpp

diff --git a/ShellExtension/src/LanguageSelect.h b/ShellExtension/Common/LanguageSelect.h
similarity index 100%
rename from ShellExtension/src/LanguageSelect.h
rename to ShellExtension/Common/LanguageSelect.h

diff --git a/ShellExtension/src/RegKey.cpp b/ShellExtension/Common/RegKey.cpp
similarity index 100%
rename from ShellExtension/src/RegKey.cpp
rename to ShellExtension/Common/RegKey.cpp

diff --git a/ShellExtension/src/RegKey.h b/ShellExtension/Common/RegKey.h
similarity index 100%
rename from ShellExtension/src/RegKey.h
rename to ShellExtension/Common/RegKey.h

diff --git a/ShellExtension/src/UnicodeString.cpp b/ShellExtension/Common/UnicodeString.cpp
similarity index 100%
rename from ShellExtension/src/UnicodeString.cpp
rename to ShellExtension/Common/UnicodeString.cpp

diff --git a/ShellExtension/src/UnicodeString.h b/ShellExtension/Common/UnicodeString.h
similarity index 100%
rename from ShellExtension/src/UnicodeString.h
rename to ShellExtension/Common/UnicodeString.h

diff --git a/ShellExtension/src/WinMerge.ico b/ShellExtension/Resources/WinMerge.ico
similarity index 100%
rename from ShellExtension/src/WinMerge.ico
rename to ShellExtension/Resources/WinMerge.ico

diff --git a/ShellExtension/src/WinMergeDir.ico b/ShellExtension/Resources/WinMergeDir.ico
similarity index 100%
rename from ShellExtension/src/WinMergeDir.ico
rename to ShellExtension/Resources/WinMergeDir.ico

diff --git a/ShellExtension/ShellExtension.vs2017.sln b/ShellExtension/ShellExtension.vs2017.sln
index 0c63bac..2c9b794 100644 (file)
--- a/ShellExtension/ShellExtension.vs2017.sln
+++ b/ShellExtension/ShellExtension.vs2017.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15\r
 VisualStudioVersion = 15.0.27130.0\r
 MinimumVisualStudioVersion = 10.0.40219.1\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShellExtension", "src\ShellExtension.vcxproj", "{76A538A1-9D2C-49CB-AE9F-72548CE37F88}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShellExtension", "ShellExtension\ShellExtension.vcxproj", "{76A538A1-9D2C-49CB-AE9F-72548CE37F88}"\r
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r

diff --git a/ShellExtension/ShellExtension.vs2019.sln b/ShellExtension/ShellExtension.vs2019.sln
index 53ba1b2..4ed8eb4 100644 (file)
--- a/ShellExtension/ShellExtension.vs2019.sln
+++ b/ShellExtension/ShellExtension.vs2019.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28407.52
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShellExtension", "src\ShellExtension.vcxproj", "{76A538A1-9D2C-49CB-AE9F-72548CE37F88}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShellExtension", "ShellExtension\ShellExtension.vcxproj", "{76A538A1-9D2C-49CB-AE9F-72548CE37F88}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/ShellExtension/src/Resource.h b/ShellExtension/ShellExtension/Resource.h
similarity index 100%
rename from ShellExtension/src/Resource.h
rename to ShellExtension/ShellExtension/Resource.h

diff --git a/ShellExtension/src/ShellExtension.clw b/ShellExtension/ShellExtension/ShellExtension.clw
similarity index 100%
rename from ShellExtension/src/ShellExtension.clw
rename to ShellExtension/ShellExtension/ShellExtension.clw

diff --git a/ShellExtension/src/ShellExtension.cpp b/ShellExtension/ShellExtension/ShellExtension.cpp
similarity index 99%
rename from ShellExtension/src/ShellExtension.cpp
rename to ShellExtension/ShellExtension/ShellExtension.cpp
index 762c0c4..f47b3c1 100644 (file)
--- a/ShellExtension/src/ShellExtension.cpp
+++ b/ShellExtension/ShellExtension/ShellExtension.cpp
@@ -31,7 +31,7 @@
 #include <initguid.h>
 #include "ShellExtension.h"
 #include "ShellExtension_i.c"
-#include "RegKey.h"
+#include "../Common/RegKey.h"
 
 class CWinMergeShellModule : public ATL::CAtlDllModuleT< CWinMergeShellModule >
 {

diff --git a/ShellExtension/src/ShellExtension.def b/ShellExtension/ShellExtension/ShellExtension.def
similarity index 100%
rename from ShellExtension/src/ShellExtension.def
rename to ShellExtension/ShellExtension/ShellExtension.def

diff --git a/ShellExtension/src/ShellExtension.idl b/ShellExtension/ShellExtension/ShellExtension.idl
similarity index 100%
rename from ShellExtension/src/ShellExtension.idl
rename to ShellExtension/ShellExtension/ShellExtension.idl

diff --git a/ShellExtension/src/ShellExtension.rc b/ShellExtension/ShellExtension/ShellExtension.rc
similarity index 91%
rename from ShellExtension/src/ShellExtension.rc
rename to ShellExtension/ShellExtension/ShellExtension.rc
index 712d7fd..fa942d0 100644 (file)
--- a/ShellExtension/src/ShellExtension.rc
+++ b/ShellExtension/ShellExtension/ShellExtension.rc
@@ -98,8 +98,8 @@ IDR_WINMERGESHELL       REGISTRY                "WinMergeShell.rgs"
 // Icon\r
 //\r
 \r
-IDI_WINMERGE            ICON                    "WinMerge.ico"\r
-IDI_WINMERGEDIR         ICON                    "WinMergeDir.ico"\r
+IDI_WINMERGE            ICON                    "..\Resources\WinMerge.ico"\r
+IDI_WINMERGEDIR         ICON                    "..\Resources\WinMergeDir.ico"\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r

diff --git a/ShellExtension/src/ShellExtension.vcxproj b/ShellExtension/ShellExtension/ShellExtension.vcxproj
similarity index 97%
rename from ShellExtension/src/ShellExtension.vcxproj
rename to ShellExtension/ShellExtension/ShellExtension.vcxproj
index bd4d2fe..6e7b296 100644 (file)
--- a/ShellExtension/src/ShellExtension.vcxproj
+++ b/ShellExtension/ShellExtension/ShellExtension.vcxproj
@@ -385,11 +385,11 @@
     </ResourceCompile>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="LanguageSelect.cpp" />\r
-    <ClCompile Include="RegKey.cpp" />\r
+    <ClCompile Include="..\Common\LanguageSelect.cpp" />\r
+    <ClCompile Include="..\Common\RegKey.cpp" />\r
+    <ClCompile Include="..\Common\UnicodeString.cpp" />\r
     <ClCompile Include="ShellExtension.cpp" />\r
     <ClCompile Include="StdAfx.cpp" />\r
-    <ClCompile Include="UnicodeString.cpp" />\r
     <ClCompile Include="WinMergeShell.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
@@ -433,11 +433,11 @@
     </Midl>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="LanguageSelect.h" />\r
-    <ClInclude Include="RegKey.h" />\r
+    <ClInclude Include="..\Common\LanguageSelect.h" />\r
+    <ClInclude Include="..\Common\RegKey.h" />\r
+    <ClInclude Include="..\Common\UnicodeString.h" />\r
     <ClInclude Include="Resource.h" />\r
     <ClInclude Include="StdAfx.h" />\r
-    <ClInclude Include="UnicodeString.h" />\r
     <ClInclude Include="WinMergeShell.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
@@ -463,4 +463,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/ShellExtension/src/ShellExtension.vcxproj.filters b/ShellExtension/ShellExtension/ShellExtension.vcxproj.filters
similarity index 100%
rename from ShellExtension/src/ShellExtension.vcxproj.filters
rename to ShellExtension/ShellExtension/ShellExtension.vcxproj.filters

diff --git a/ShellExtension/src/ShellExtensionARM64.def b/ShellExtension/ShellExtension/ShellExtensionARM64.def
similarity index 100%
rename from ShellExtension/src/ShellExtensionARM64.def
rename to ShellExtension/ShellExtension/ShellExtensionARM64.def

diff --git a/ShellExtension/src/ShellExtensionU.def b/ShellExtension/ShellExtension/ShellExtensionU.def
similarity index 100%
rename from ShellExtension/src/ShellExtensionU.def
rename to ShellExtension/ShellExtension/ShellExtensionU.def

diff --git a/ShellExtension/src/ShellExtensionX64.def b/ShellExtension/ShellExtension/ShellExtensionX64.def
similarity index 100%
rename from ShellExtension/src/ShellExtensionX64.def
rename to ShellExtension/ShellExtension/ShellExtensionX64.def

diff --git a/ShellExtension/src/ShellExtensionps.def b/ShellExtension/ShellExtension/ShellExtensionps.def
similarity index 100%
rename from ShellExtension/src/ShellExtensionps.def
rename to ShellExtension/ShellExtension/ShellExtensionps.def

diff --git a/ShellExtension/src/ShellExtensionps.mk b/ShellExtension/ShellExtension/ShellExtensionps.mk
similarity index 100%
rename from ShellExtension/src/ShellExtensionps.mk
rename to ShellExtension/ShellExtension/ShellExtensionps.mk

diff --git a/ShellExtension/src/StdAfx.cpp b/ShellExtension/ShellExtension/StdAfx.cpp
similarity index 100%
rename from ShellExtension/src/StdAfx.cpp
rename to ShellExtension/ShellExtension/StdAfx.cpp

diff --git a/ShellExtension/src/StdAfx.h b/ShellExtension/ShellExtension/StdAfx.h
similarity index 100%
rename from ShellExtension/src/StdAfx.h
rename to ShellExtension/ShellExtension/StdAfx.h

diff --git a/ShellExtension/src/WinMergeShell.cpp b/ShellExtension/ShellExtension/WinMergeShell.cpp
similarity index 99%
rename from ShellExtension/src/WinMergeShell.cpp
rename to ShellExtension/ShellExtension/WinMergeShell.cpp
index f2e8356..0d6918a 100644 (file)
--- a/ShellExtension/src/WinMergeShell.cpp
+++ b/ShellExtension/ShellExtension/WinMergeShell.cpp
@@ -42,8 +42,8 @@
 #include "stdafx.h"
 #include "ShellExtension.h"
 #include "WinMergeShell.h"
-#include "UnicodeString.h"
-#include "RegKey.h"
+#include "../Common/UnicodeString.h"
+#include "../Common/RegKey.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 

diff --git a/ShellExtension/src/WinMergeShell.h b/ShellExtension/ShellExtension/WinMergeShell.h
similarity index 97%
rename from ShellExtension/src/WinMergeShell.h
rename to ShellExtension/ShellExtension/WinMergeShell.h
index e70b250..25d0e87 100644 (file)
--- a/ShellExtension/src/WinMergeShell.h
+++ b/ShellExtension/ShellExtension/WinMergeShell.h
@@ -31,8 +31,8 @@
 #include <comdef.h>
 #include <atlconv.h>   // for ATL string conversion macros
 #include "resource.h"   // main symbols
-#include "UnicodeString.h"
-#include "LanguageSelect.h"
+#include "../Common/UnicodeString.h"
+#include "../Common/LanguageSelect.h"
 
 /**
  * @brief Class for handling shell extension tasks

diff --git a/ShellExtension/src/WinMergeShell.rgs b/ShellExtension/ShellExtension/WinMergeShell.rgs
similarity index 100%
rename from ShellExtension/src/WinMergeShell.rgs
rename to ShellExtension/ShellExtension/WinMergeShell.rgs

diff --git a/Src/MergeLang.vcxproj b/Src/MergeLang.vcxproj
index 97f7f2a..b416af2 100644 (file)
--- a/Src/MergeLang.vcxproj
+++ b/Src/MergeLang.vcxproj
@@ -246,8 +246,8 @@ popd
     <None Include="..\Translations\WinMerge\UpdatePoFilesFromPotFile.ps1" />
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\ShellExtension\ShellExtension.rc">
-      <Outputs>$(ProjectDir)..\Translations\ShellExtension\MergeLang.lastbuild</Outputs>
+    <CustomBuild Include="..\ShellExtension\ShellExtension\ShellExtension.rc">
+      <Outputs>$(ProjectDir)..\..\Translations\ShellExtension\MergeLang.lastbuild</Outputs>
       <Command>pushd ..\Translations\ShellExtension
 
 date /t &gt; MergeLang.lastbuild

diff --git a/Src/MergeLang.vcxproj.filters b/Src/MergeLang.vcxproj.filters
index 0099512..7082c7f 100644 (file)
--- a/Src/MergeLang.vcxproj.filters
+++ b/Src/MergeLang.vcxproj.filters
@@ -257,7 +257,7 @@
     <CustomBuild Include="Merge.rc">
       <Filter>Resource FIles</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\ShellExtension\ShellExtension.rc">
+    <CustomBuild Include="..\ShellExtension\ShellExtension\ShellExtension.rc">
       <Filter>Resource FIles</Filter>
     </CustomBuild>
   </ItemGroup>

diff --git a/Translations/ShellExtension/CreateMasterPotFile.vbs b/Translations/ShellExtension/CreateMasterPotFile.vbs
index cd7ccc9..5b20e79 100644 (file)
--- a/Translations/ShellExtension/CreateMasterPotFile.vbs
+++ b/Translations/ShellExtension/CreateMasterPotFile.vbs
@@ -14,7 +14,7 @@ Const NO_BLOCK = 0
 Const STRINGTABLE_BLOCK = 1
 
 Const PATH_ENGLISH_POT = "English.pot"
-Const PATH_SHELLEXTTEMPLATE_RC = "../../ShellExtension/ShellExtension.rc"
+Const PATH_SHELLEXTTEMPLATE_RC = "../../ShellExtension/ShellExtension/ShellExtension.rc"
 
 Dim oFSO, bRunFromCmd