Make ShellExtension compile after CVS reorg

diff --git a/ShellExtension/ShellExtension.dsp b/ShellExtension/ShellExtension.dsp
index e16368c..d7f8c9a 100644 (file)
--- a/ShellExtension/ShellExtension.dsp
+++ b/ShellExtension/ShellExtension.dsp
@@ -45,8 +45,8 @@ RSC=rc.exe
 # PROP Output_Dir "Debug"
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ    /c
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../src/common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
 # ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
@@ -80,8 +80,8 @@ SOURCE="$(InputPath)"
 # PROP Output_Dir "DebugU"
 # PROP Intermediate_Dir "DebugU"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ    /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_USRDLL" /D "_UNICODE" /Yu"stdafx.h" /FD /GZ  /c
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_USRDLL" /D "_UNICODE" /Yu"stdafx.h" /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
 # ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
@@ -122,7 +122,7 @@ SOURCE="$(InputPath)"
 # PROP Intermediate_Dir "ReleaseMinSize"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /I "../common" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /I "../src/common" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /Yu"stdafx.h" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
 # ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
@@ -276,11 +276,11 @@ SOURCE="$(InputPath)"
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\common\coretools.cpp
+SOURCE=..\src\common\coretools.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\common\RegKey.cpp
+SOURCE=..\src\common\RegKey.cpp
 # End Source File
 # Begin Source File
 
@@ -314,11 +314,11 @@ SOURCE=.\WinMergeShell.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\common\coretools.h
+SOURCE=..\src\common\coretools.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\common\RegKey.h
+SOURCE=..\src\common\RegKey.h
 # End Source File
 # Begin Source File
 

diff --git a/ShellExtension/StdAfx.cpp b/ShellExtension/StdAfx.cpp
index a5eea17..ffbf756 100644 (file)
--- a/ShellExtension/StdAfx.cpp
+++ b/ShellExtension/StdAfx.cpp
@@ -10,3 +10,15 @@
 #endif
 
 #include <atlimpl.cpp>
+
+/**
+ * @brief Get appropriate clipboard format for TCHAR text
+ */
+int GetClipTcharTextFormat()
+{
+#ifdef _UNICODE
+       return CF_UNICODETEXT;
+#else
+       return CF_TEXT;
+#endif // _UNICODE
+}

diff --git a/ShellExtension/StdAfx.h b/ShellExtension/StdAfx.h
index d0e3ed5..22e2ff8 100644 (file)
--- a/ShellExtension/StdAfx.h
+++ b/ShellExtension/StdAfx.h
@@ -24,6 +24,8 @@
 extern CComModule _Module;
 #include <atlcom.h>
 
+int GetClipTcharTextFormat();
+
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
 

diff --git a/ShellExtension/readme.txt b/ShellExtension/readme.txt
new file mode 100644 (file)
index 0000000..962fd4c
--- /dev/null
+++ b/ShellExtension/readme.txt
@@ -0,0 +1,27 @@
+2004-01-15 Kimmo
+ Make ShellExtension compile after CVS reorg
+  ShellExtension: ShellExtension.dsp stdafx.h stdafx.cpp
+ 
+2003-11-03 Kimmo
+ PATCH: [ 834526 ] Check that file exist before executing in ShellExtension
+  ShellExtension: ShellExtension.dsp WinMergeShell.h WinMergeShell.cpp
+
+2003-08-17 Kimmo
+ Updated comments for ShellExtension: added comment about used registry values etc
+  ShellExtension:
+   ShellExtension.cpp WinMergeShell.h WinMergeShell.cpp
+ Removed two generated files from CVS (Christian spotted those)
+  ShellExtension: 
+   ShellExtension.h DllData.cp
+   
+2003-07-29 Kimmo
+ Fix Register.bat comments. Batch files use ":" for comments...
+  ShellExtension: Register.bat
+
+2003-07-26 Kimmo
+ BUG: [ 778166 ] Shell integration missing quotes (2.1)
+  ShellExtension: WinMergeShell.cpp
+
+2003-07-25 Kimmo
+ PATCH: [ 773296 ] Add shell integration
+  Added new module ShellExtension