3.20

17 files changed, 28 insertions, 27 deletions

diff --git a/RealtimeSync/RealtimeSync.cbp b/RealtimeSync/RealtimeSync.cbp
index 867b898c..8464abfc 100644
--- a/RealtimeSync/RealtimeSync.cbp
+++ b/RealtimeSync/RealtimeSync.cbp
@@ -92,6 +92,7 @@
 			<Add library="libcomdlg32.a" />
 			<Add library="libws2_32.a" />
 			<Add library="libwinspool.a" />
+			<Add library="libmpr.a" />
 			<Add directory="C:\Program Files\C++\Boost\stage\lib" />
 		</Linker>
 		<Unit filename="WxWizDialog.fbp" />
@@ -122,7 +123,6 @@
 		<Unit filename="..\Shared\zstring.cpp" />
 		<Unit filename="..\Shared\zstring.h" />
 		<Unit filename="..\library\process_xml.cpp" />
-		<Unit filename="..\shared\check_exist.cpp" />
 		<Unit filename="..\shared\dir_watcher.cpp" />
 		<Unit filename="..\shared\dir_watcher.h" />
 		<Unit filename="..\shared\dll_loader.cpp" />
@@ -154,6 +154,7 @@
 		<Unit filename="..\shared\privilege.cpp" />
 		<Unit filename="..\shared\resolve_path.cpp" />
 		<Unit filename="..\shared\resolve_path.h" />
+		<Unit filename="..\shared\shell_execute.h" />
 		<Unit filename="..\shared\standard_paths.cpp" />
 		<Unit filename="..\shared\standard_paths.h" />
 		<Unit filename="..\shared\util.cpp" />
diff --git a/RealtimeSync/RealtimeSync.vcxproj b/RealtimeSync/RealtimeSync.vcxproj
index cdeb18b4..5936b74c 100644
--- a/RealtimeSync/RealtimeSync.vcxproj
+++ b/RealtimeSync/RealtimeSync.vcxproj
@@ -106,7 +106,7 @@
       <MultiProcessorCompilation>false</MultiProcessorCompilation>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
       <PrecompiledHeaderOutputFile>$(IntDir)pch.obj</PrecompiledHeaderOutputFile>
-      <ForcedIncludeFiles>$(ProjectDir)/../shared/pch.h</ForcedIncludeFiles>
+      <ForcedIncludeFiles>$(SolutionDir)shared/warn_static.h;$(ProjectDir)/../shared/pch.h</ForcedIncludeFiles>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
@@ -136,7 +136,7 @@
       <MultiProcessorCompilation>false</MultiProcessorCompilation>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
       <PrecompiledHeaderOutputFile>$(IntDir)pch.obj</PrecompiledHeaderOutputFile>
-      <ForcedIncludeFiles>$(ProjectDir)/../shared/pch.h</ForcedIncludeFiles>
+      <ForcedIncludeFiles>$(SolutionDir)shared/warn_static.h;$(ProjectDir)/../shared/pch.h</ForcedIncludeFiles>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </ClCompile>
@@ -169,6 +169,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
+      <ForcedIncludeFiles>$(SolutionDir)shared/warn_static.h;</ForcedIncludeFiles>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -204,6 +205,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
       <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ForcedIncludeFiles>$(SolutionDir)shared/warn_static.h;</ForcedIncludeFiles>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -226,7 +228,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\library\process_xml.cpp" />
-    <ClCompile Include="..\shared\check_exist.cpp" />
     <ClCompile Include="..\shared\custom_button.cpp" />
     <ClCompile Include="..\shared\dir_watcher.cpp" />
     <ClCompile Include="..\shared\dll_loader.cpp" />
diff --git a/RealtimeSync/application.cpp b/RealtimeSync/application.cpp
index 196e0ecc..6b7e81e9 100644
--- a/RealtimeSync/application.cpp
+++ b/RealtimeSync/application.cpp
@@ -3,7 +3,7 @@
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
 // * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
 // **************************************************************************
-//
+
 #include "application.h"
 #include "main_dlg.h"
 #include <wx/event.h>
diff --git a/RealtimeSync/application.h b/RealtimeSync/application.h
index a8a931e0..6b5481ad 100644
--- a/RealtimeSync/application.h
+++ b/RealtimeSync/application.h
@@ -3,7 +3,7 @@
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
 // * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
 // **************************************************************************
-//
+
 #ifndef REALTIMESYNCAPP_H
 #define REALTIMESYNCAPP_H
 
diff --git a/RealtimeSync/main_dlg.cpp b/RealtimeSync/main_dlg.cpp
index 860ddcef..e8851428 100644
--- a/RealtimeSync/main_dlg.cpp
+++ b/RealtimeSync/main_dlg.cpp
@@ -3,7 +3,7 @@
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
 // * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
 // **************************************************************************
-//
+
 #include "main_dlg.h"
 #include "resources.h"
 #include "../shared/custom_button.h"
diff --git a/RealtimeSync/main_dlg.h b/RealtimeSync/main_dlg.h
index 2ce04557..54d4d50c 100644
--- a/RealtimeSync/main_dlg.h
+++ b/RealtimeSync/main_dlg.h
@@ -3,7 +3,7 @@
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
 // * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
 // **************************************************************************
-//
+
 #ifndef REALTIMESYNCMAIN_H
 #define REALTIMESYNCMAIN_H
 
diff --git a/RealtimeSync/makefile b/RealtimeSync/makefile
index 2e123af2..3bc19061 100644
--- a/RealtimeSync/makefile
+++ b/RealtimeSync/makefile
@@ -27,7 +27,6 @@ FILE_LIST+=xml_ffs.cpp
 FILE_LIST+=../library/process_xml.cpp
 FILE_LIST+=../structures.cpp
 FILE_LIST+=../shared/util.cpp
-FILE_LIST+=../shared/check_exist.cpp
 FILE_LIST+=../shared/i18n.cpp
 FILE_LIST+=../shared/localization.cpp
 FILE_LIST+=../shared/dir_watcher.cpp
diff --git a/RealtimeSync/resources.cpp b/RealtimeSync/resources.cpp
index 3f7f7988..e9231623 100644
--- a/RealtimeSync/resources.cpp
+++ b/RealtimeSync/resources.cpp
@@ -3,7 +3,7 @@
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
 // * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
 // **************************************************************************
-//
+
 #include "resources.h"
 #include <wx/wfstream.h>
 #include <wx/zipstrm.h>
diff --git a/RealtimeSync/resources.h b/RealtimeSync/resources.h
index 1237c811..fec82358 100644
--- a/RealtimeSync/resources.h
+++ b/RealtimeSync/resources.h
@@ -3,7 +3,7 @@
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
 // * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
 // **************************************************************************
-//
+
 #ifndef RESOURCES_H_INCLUDED
 #define RESOURCES_H_INCLUDED
 
diff --git a/RealtimeSync/tray_menu.cpp b/RealtimeSync/tray_menu.cpp
index e6d5f0d4..98c66cb5 100644
--- a/RealtimeSync/tray_menu.cpp
+++ b/RealtimeSync/tray_menu.cpp
@@ -3,7 +3,7 @@
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
 // * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
 // **************************************************************************
-//
+
 #include "tray_menu.h"
 #include <algorithm>
 #include <iterator>
@@ -299,8 +299,8 @@ rts::MonitorResponse rts::startDirectoryMonitor(const xmlAccess::XmlRealConfig&
 
         if (config.commandline.empty())
         {
-            std::wstring errorMsg = _("Invalid commandline: \"%x\"");
-            replace(errorMsg, L"%x", config.commandline);
+            std::wstring errorMsg = _("Invalid commandline: %x");
+            replace(errorMsg, L"%x", L"\"" + config.commandline + L"\"");
             throw FileError(errorMsg);
         }
 
diff --git a/RealtimeSync/tray_menu.h b/RealtimeSync/tray_menu.h
index 01fbba17..80f2d26c 100644
--- a/RealtimeSync/tray_menu.h
+++ b/RealtimeSync/tray_menu.h
@@ -3,7 +3,7 @@
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
 // * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
 // **************************************************************************
-//
+
 #ifndef TRAYMENU_H_INCLUDED
 #define TRAYMENU_H_INCLUDED
 
diff --git a/RealtimeSync/watcher.cpp b/RealtimeSync/watcher.cpp
index 059f420b..b17c63ba 100644
--- a/RealtimeSync/watcher.cpp
+++ b/RealtimeSync/watcher.cpp
@@ -3,7 +3,7 @@
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
 // * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
 // **************************************************************************
-//
+
 #include "watcher.h"
 #include "../shared/file_handling.h"
 #include "../shared/i18n.h"
@@ -120,13 +120,13 @@ rts::WaitResult rts::waitForChanges(const std::vector<Zstring>& dirNames, WaitCa
 
                 if (!changedFiles.empty())
                 {
-/*
-                std::for_each(changedFiles.begin(), changedFiles.end(),
-                [](const Zstring& fn) { wxMessageBox(toWx(fn));});
+                    /*
+                                    std::for_each(changedFiles.begin(), changedFiles.end(),
+                                    [](const Zstring& fn) { wxMessageBox(toWx(fn));});
 
-				const wxString filename = toWx(changedFiles[0]);
-                    ::wxSetEnv(wxT("RTS_CHANGE"), filename);
-*/
+                    				const wxString filename = toWx(changedFiles[0]);
+                                        ::wxSetEnv(wxT("RTS_CHANGE"), filename);
+                    */
 
                     return CHANGE_DETECTED; //directory change detected
                 }
diff --git a/RealtimeSync/watcher.h b/RealtimeSync/watcher.h
index 7208e7fb..04a0d860 100644
--- a/RealtimeSync/watcher.h
+++ b/RealtimeSync/watcher.h
@@ -3,7 +3,7 @@
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
 // * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
 // **************************************************************************
-//
+
 #ifndef WATCHER_H_INCLUDED
 #define WATCHER_H_INCLUDED
 
diff --git a/RealtimeSync/xml_ffs.cpp b/RealtimeSync/xml_ffs.cpp
index 3424dea2..ed0a4331 100644
--- a/RealtimeSync/xml_ffs.cpp
+++ b/RealtimeSync/xml_ffs.cpp
@@ -3,7 +3,7 @@
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
 // * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
 // **************************************************************************
-//
+
 #include "xml_ffs.h"
 #include "../shared/standard_paths.h"
 #include "../shared/global_func.h"
diff --git a/RealtimeSync/xml_ffs.h b/RealtimeSync/xml_ffs.h
index fb48712a..f359c039 100644
--- a/RealtimeSync/xml_ffs.h
+++ b/RealtimeSync/xml_ffs.h
@@ -3,7 +3,7 @@
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
 // * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
 // **************************************************************************
-//
+
 #ifndef XMLFREEFILESYNC_H_INCLUDED
 #define XMLFREEFILESYNC_H_INCLUDED
 
diff --git a/RealtimeSync/xml_proc.cpp b/RealtimeSync/xml_proc.cpp
index e3d7f270..b9839f9c 100644
--- a/RealtimeSync/xml_proc.cpp
+++ b/RealtimeSync/xml_proc.cpp
@@ -3,7 +3,7 @@
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
 // * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
 // **************************************************************************
-//
+
 #include "xml_proc.h"
 #include <wx/filefn.h>
 #include "../shared/i18n.h"
diff --git a/RealtimeSync/xml_proc.h b/RealtimeSync/xml_proc.h
index 3e2549b0..37d2e029 100644
--- a/RealtimeSync/xml_proc.h
+++ b/RealtimeSync/xml_proc.h
@@ -3,7 +3,7 @@
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
 // * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
 // **************************************************************************
-//
+
 #ifndef XMLPROCESSING_H_INCLUDED
 #define XMLPROCESSING_H_INCLUDED