Merge pull request #414 from mlt/fix413

Fix VS2013 build and close #413

Config.cpp

@@ -126,6 +126,7 @@ namespace config {
 #ifdef _WIN32
       ("svcctl",    value<std::string>()->default_value(""),     "Windows service management ('install' or 'remove')")
       ("insomnia", value<bool>()->zero_tokens()->default_value(false), "Prevent system from sleeping")
+      ("close", value<std::string>()->default_value("ask"), "On close action") // minimize, exit, ask TODO: add custom validator or something
 #endif
       ;
 

Win32/Win32App.cpp

@@ -4,6 +4,11 @@
 #include "../Config.h"
 #include "resource.h"
 #include "Win32App.h"
+#include <stdio.h>
+
+#if defined(_MSC_VER) && _MSC_VER < 1900
+#define snprintf _snprintf
+#endif
 
 #define ID_ABOUT 2000
 #define ID_EXIT 2001
@@ -98,7 +103,7 @@ namespace win32
                         char buf[30];
                         std::string httpAddr; i2p::config::GetOption("http.address", httpAddr);
                         uint16_t    httpPort; i2p::config::GetOption("http.port", httpPort);
-                        std::snprintf(buf, 30, "http://%s:%d", httpAddr.c_str(), httpPort);
+                        snprintf(buf, 30, "http://%s:%d", httpAddr.c_str(), httpPort);
                         ShellExecute(NULL, "open", buf, NULL, NULL, SW_SHOWNORMAL);
                         return 0;
                     }
@@ -119,6 +124,29 @@ namespace win32
                         ShowWindow(hWnd, SW_HIDE);
                         return 0;
                     }
+                    case SC_CLOSE:
+                    {
+                        std::string close; i2p::config::GetOption("close", close);
+                        if (0 == close.compare("ask"))
+                            switch(::MessageBox(hWnd, "Would you like to minimize instead of exiting?"
+                                " You can add 'close' configuration option. Valid values are: ask, minimize, exit.",
+                                "Minimize instead of exiting?", MB_ICONQUESTION | MB_YESNOCANCEL | MB_DEFBUTTON1))
+                            {
+                                case IDYES: close = "minimize"; break;
+                                case IDNO: close = "exit"; break;
+                                default: return 0;
+                            }
+                        if (0 == close.compare("minimize"))
+                        {
+                            ShowWindow(hWnd, SW_HIDE);
+                            return 0;
+                        }
+                        if (0 != close.compare("exit"))
+                        {
+                            ::MessageBox(hWnd, close.c_str(), "Unknown close action in config", MB_OK | MB_ICONWARNING);
+                            return 0;
+                        }
+                    }
                 }
             }
             case WM_TRAYICON: