invoke win32app functions from main

Daemon.h

@@ -24,14 +24,14 @@ namespace i2p
 
 			bool isLogging;
 			bool isDaemon;
-			
+
 			bool running;
 
 		protected:
 			Daemon_Singleton();
 			virtual ~Daemon_Singleton();
 
-			bool IsService () const;				
+			bool IsService () const;
 
 			// d-pointer for httpServer, httpProxy, etc.
 			class Daemon_Singleton_Private;
@@ -48,9 +48,10 @@ namespace i2p
 				return instance;
 			}
 
-			virtual bool init(int argc, char* argv[]);
+			bool init(int argc, char* argv[]);
-			virtual bool start();
+			bool start();
-			virtual bool stop();
+			bool stop();
+			void run ();
 		};
 #else
 		class DaemonLinux : public Daemon_Singleton

DaemonWin32.cpp

@@ -5,7 +5,7 @@
 
 #ifdef _WIN32
 
-#include "./Win32/Win32Service.h"
+#include "Win32/Win32App.h"
 
 namespace i2p
 {
@@ -16,61 +16,21 @@ namespace i2p
 			setlocale(LC_CTYPE, "");
 			SetConsoleCP(1251);
 			SetConsoleOutputCP(1251);
-			setlocale(LC_ALL, "Russian");
+			setlocale(LC_ALL, "Russian");
-
+            return Daemon_Singleton::init(argc, argv);
-			if (!Daemon_Singleton::init(argc, argv)) return false;
+		}
-			if (I2PService::isService())
-				isDaemon = 1;
-			else
-				isDaemon = 0;
 
-			std::string serviceControl; i2p::config::GetOption("svcctl", serviceControl);
-			if (serviceControl == "install")
-			{
-				LogPrint(eLogInfo, "WinSVC: installing ", SERVICE_NAME, " as service");
-				InstallService(
-					SERVICE_NAME,               // Name of service
-					SERVICE_DISPLAY_NAME,       // Name to display
-					SERVICE_START_TYPE,         // Service start type
-					SERVICE_DEPENDENCIES,       // Dependencies
-					SERVICE_ACCOUNT,            // Service running account
-					SERVICE_PASSWORD            // Password of the account
-					);
-				exit(0);
-			}
-			else if (serviceControl == "remove")
-			{
-				LogPrint(eLogInfo, "WinSVC: uninstalling ", SERVICE_NAME, " service");
-				UninstallService(SERVICE_NAME);
-				exit(0);
-			}
-			
-			if (isDaemon == 1)
-			{
-				LogPrint(eLogDebug, "Daemon: running as service");
-				I2PService service(SERVICE_NAME);
-				if (!I2PService::Run(service))
-				{
-					LogPrint(eLogError, "Daemon: Service failed to run w/err 0x%08lx\n", GetLastError());
-					exit(EXIT_FAILURE);
-				}
-				exit(EXIT_SUCCESS);
-			}
-			else
-				LogPrint(eLogDebug, "Daemon: running as user");
-
-			return true;
-		}
 		bool DaemonWin32::start()
 		{
 			setlocale(LC_CTYPE, "");
 			SetConsoleCP(1251);
 			SetConsoleOutputCP(1251);
 			setlocale(LC_ALL, "Russian");
+            if (!i2p::win32::StartWin32App ()) return false;
 
 			bool ret = Daemon_Singleton::start();
 			if (ret && IsLogToFile ())
-			{	
+			{
 				// TODO: find out where this garbage to console comes from
 				SetStdHandle(STD_OUTPUT_HANDLE, INVALID_HANDLE_VALUE);
 				SetStdHandle(STD_ERROR_HANDLE, INVALID_HANDLE_VALUE);
@@ -79,9 +39,15 @@ namespace i2p
 		}
 
 		bool DaemonWin32::stop()
-		{
+		{
+		    i2p::win32::StopWin32App ();
 			return Daemon_Singleton::stop();
-		}
+		}
+
+		void DaemonWin32::run ()
+        {
+            i2p::win32::RunWin32App ();
+        }
 	}
 }
 

Makefile

@@ -22,7 +22,7 @@ else ifeq ($(UNAME),Linux)
 	DAEMON_SRC += DaemonLinux.cpp
 	include Makefile.linux
 else # win32 mingw
-	DAEMON_SRC += DaemonWin32.cpp Win32/Win32Service.cpp Win32/Win32App.cpp
+	DAEMON_SRC += DaemonWin32.cpp Win32/Win32App.cpp
 	include Makefile.mingw
 endif
 
@@ -52,7 +52,7 @@ obj/%.o: %.cpp
 # '-' is 'ignore if missing' on first run
 -include $(DEPS)
 
-DAEMON_OBJS += $(patsubst %.cpp,obj/%.o,$(DAEMON_SRC)) 
+DAEMON_OBJS += $(patsubst %.cpp,obj/%.o,$(DAEMON_SRC))
 $(I2PD): $(DAEMON_OBJS) $(ARLIB) $(ARLIB_CLIENT)
 	$(CXX) -o $@ $^ $(LDLIBS) $(LDFLAGS)
 

Win32/Win32App.cpp

@@ -11,147 +11,152 @@
 #define ID_TRAY_ICON 2050
 #define WM_TRAYICON (WM_USER + 1)
 
-void ShowPopupMenu (HWND hWnd, POINT *curpos, int wDefaultItem)
+namespace i2p
 {
-    HMENU hPopup = CreatePopupMenu();
+namespace win32
-    InsertMenu (hPopup, 0, MF_BYPOSITION | MF_STRING, ID_ABOUT, "About...");
+{
-    InsertMenu (hPopup, 1, MF_BYPOSITION | MF_STRING, ID_EXIT , "Exit");
+    static void ShowPopupMenu (HWND hWnd, POINT *curpos, int wDefaultItem)
-    SetMenuDefaultItem (hPopup, ID_ABOUT, FALSE);
-    SetFocus (hWnd);
-    SendMessage (hWnd, WM_INITMENUPOPUP, (WPARAM)hPopup, 0);
-
-    POINT p;
-    if (!curpos)
     {
-        GetCursorPos (&p);
+        HMENU hPopup = CreatePopupMenu();
-        curpos = &p;
+        InsertMenu (hPopup, 0, MF_BYPOSITION | MF_STRING, ID_ABOUT, "About...");
-    }
+        InsertMenu (hPopup, 1, MF_BYPOSITION | MF_STRING, ID_EXIT , "Exit");
+        SetMenuDefaultItem (hPopup, ID_ABOUT, FALSE);
+        SetFocus (hWnd);
+        SendMessage (hWnd, WM_INITMENUPOPUP, (WPARAM)hPopup, 0);
 
-    WORD cmd = TrackPopupMenu (hPopup, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD | TPM_NONOTIFY, curpos->x, curpos->y, 0, hWnd, NULL);
+        POINT p;
-    SendMessage (hWnd, WM_COMMAND, cmd, 0);
+        if (!curpos)
+        {
+            GetCursorPos (&p);
+            curpos = &p;
+        }
 
-    DestroyMenu(hPopup);
+        WORD cmd = TrackPopupMenu (hPopup, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD | TPM_NONOTIFY, curpos->x, curpos->y, 0, hWnd, NULL);
-}
+        SendMessage (hWnd, WM_COMMAND, cmd, 0);
 
-void AddTrayIcon (HWND hWnd)
+        DestroyMenu(hPopup);
-{
+    }
-    NOTIFYICONDATA nid;
-    memset(&nid, 0, sizeof(nid));
-    nid.cbSize = sizeof(nid);
-    nid.hWnd = hWnd;
-    nid.uID = ID_TRAY_ICON;
-    nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
-    nid.uCallbackMessage = WM_TRAYICON;
-    nid.hIcon = LoadIcon (GetModuleHandle(NULL), MAKEINTRESOURCE (IDI_ICON1));
-    strcpy (nid.szTip, "i2pd");
-    Shell_NotifyIcon(NIM_ADD, &nid );
-}
 
-void RemoveTrayIcon (HWND hWnd)
+    static void AddTrayIcon (HWND hWnd)
-{
+    {
-    NOTIFYICONDATA nid;
+        NOTIFYICONDATA nid;
-    nid.hWnd = hWnd;
+        memset(&nid, 0, sizeof(nid));
-    nid.uID = ID_TRAY_ICON;
+        nid.cbSize = sizeof(nid);
-    Shell_NotifyIcon (NIM_DELETE, &nid);
+        nid.hWnd = hWnd;
-}
+        nid.uID = ID_TRAY_ICON;
+        nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
+        nid.uCallbackMessage = WM_TRAYICON;
+        nid.hIcon = LoadIcon (GetModuleHandle(NULL), MAKEINTRESOURCE (IDI_ICON1));
+        strcpy (nid.szTip, "i2pd");
+        Shell_NotifyIcon(NIM_ADD, &nid );
+    }
 
-static LRESULT CALLBACK WndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+    static void RemoveTrayIcon (HWND hWnd)
-{
-    switch (uMsg)
     {
-        case WM_CREATE:
+        NOTIFYICONDATA nid;
-        {
+        nid.hWnd = hWnd;
-            AddTrayIcon (hWnd);
+        nid.uID = ID_TRAY_ICON;
-            break;
+        Shell_NotifyIcon (NIM_DELETE, &nid);
-        }
+    }
-        case WM_CLOSE:
+
-        {
+    static LRESULT CALLBACK WndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-            RemoveTrayIcon (hWnd);
+    {
-            PostQuitMessage (0);
+        switch (uMsg)
-            break;
-        }
-        case WM_COMMAND:
         {
-            switch (LOWORD(wParam))
+            case WM_CREATE:
             {
-                case ID_ABOUT:
+                AddTrayIcon (hWnd);
-                {
+                break;
-                    MessageBox( hWnd, TEXT("i2pd"), TEXT("About"), MB_ICONINFORMATION | MB_OK );
+            }
-                    return 0;
+            case WM_CLOSE:
-                }
+            {
-                case ID_EXIT:
+                RemoveTrayIcon (hWnd);
+                PostQuitMessage (0);
+                break;
+            }
+            case WM_COMMAND:
+            {
+                switch (LOWORD(wParam))
                 {
-                    PostMessage (hWnd, WM_CLOSE, 0, 0);
+                    case ID_ABOUT:
-                    return 0;
+                    {
+                        MessageBox( hWnd, TEXT("i2pd"), TEXT("About"), MB_ICONINFORMATION | MB_OK );
+                        return 0;
+                    }
+                    case ID_EXIT:
+                    {
+                        PostMessage (hWnd, WM_CLOSE, 0, 0);
+                        return 0;
+                    }
                 }
+                break;
             }
-            break;
+            case WM_TRAYICON:
-        }
-        case WM_TRAYICON:
-        {
-            SetForegroundWindow (hWnd);
-            switch (lParam)
             {
-                case WM_RBUTTONUP:
+                SetForegroundWindow (hWnd);
+                switch (lParam)
                 {
-                    SetForegroundWindow (hWnd);
+                    case WM_RBUTTONUP:
-                    ShowPopupMenu(hWnd, NULL, -1);
+                    {
-                    PostMessage (hWnd, WM_APP + 1, 0, 0);
+                        SetForegroundWindow (hWnd);
-                    break;
+                        ShowPopupMenu(hWnd, NULL, -1);
+                        PostMessage (hWnd, WM_APP + 1, 0, 0);
+                        break;
+                    }
                 }
+                break;
             }
-            break;
         }
+        return DefWindowProc( hWnd, uMsg, wParam, lParam);
     }
-    return DefWindowProc( hWnd, uMsg, wParam, lParam);
-}
 
- int WINAPI WinMain (HINSTANCE hInst, HINSTANCE prev, LPSTR cmdline, int show)
+    bool StartWin32App ()
- {
-    // check if tunning already
-    if (FindWindow (I2PD_WIN32_CLASSNAME, TEXT("i2pd")))
     {
-        MessageBox(NULL, TEXT("I2Pd is running already"), TEXT("Warning"), MB_OK);
+        if (FindWindow (I2PD_WIN32_CLASSNAME, TEXT("i2pd")))
-        return 0;
+        {
+            MessageBox(NULL, TEXT("I2Pd is running already"), TEXT("Warning"), MB_OK);
+            return false;
+        }
+        // register main window
+        auto hInst = GetModuleHandle(NULL);
+        WNDCLASSEX wclx;
+        memset (&wclx, 0, sizeof(wclx));
+        wclx.cbSize = sizeof(wclx);
+        wclx.style = 0;
+        wclx.lpfnWndProc = WndProc;
+        wclx.cbClsExtra = 0;
+        wclx.cbWndExtra = 0;
+        wclx.hInstance = hInst;
+        wclx.hIcon = LoadIcon (hInst, IDI_APPLICATION);
+        wclx.hIconSm = LoadIcon (hInst, IDI_APPLICATION);
+        wclx.hCursor = LoadCursor (NULL, IDC_ARROW);
+        wclx.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
+        wclx.lpszMenuName = NULL;
+        wclx.lpszClassName = I2PD_WIN32_CLASSNAME;
+        RegisterClassEx (&wclx);
+        // create new window
+        if (!CreateWindow(I2PD_WIN32_CLASSNAME, TEXT("i2pd"), WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 250, 150, NULL, NULL, hInst, NULL))
+        {
+            MessageBox(NULL, "Failed to create main window", TEXT("Warning!"), MB_ICONERROR | MB_OK | MB_TOPMOST);
+            return false;
+        }
+        return true;
     }
-    // register main window
+
-    WNDCLASSEX wclx;
+    int RunWin32App ()
-    memset (&wclx, 0, sizeof(wclx));
-    wclx.cbSize = sizeof(wclx);
-    wclx.style = 0;
-    wclx.lpfnWndProc = WndProc;
-    wclx.cbClsExtra = 0;
-    wclx.cbWndExtra = 0;
-    wclx.hInstance = hInst;
-    wclx.hIcon = LoadIcon (hInst, IDI_APPLICATION);
-    wclx.hIconSm = LoadIcon (hInst, IDI_APPLICATION);
-    wclx.hCursor = LoadCursor (NULL, IDC_ARROW);
-    wclx.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
-    wclx.lpszMenuName = NULL;
-    wclx.lpszClassName = I2PD_WIN32_CLASSNAME;
-    RegisterClassEx (&wclx);
-    // create new window
-    if (!CreateWindow(I2PD_WIN32_CLASSNAME, TEXT("i2pd"), WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 250, 150, NULL, NULL, hInst, NULL))
     {
-        MessageBox(NULL, "Failed to create main window", TEXT("Warning!"), MB_ICONERROR | MB_OK | MB_TOPMOST);
+        MSG msg;
-        return 1;
+        while (GetMessage (&msg, NULL, 0, 0 ))
+        {
+            TranslateMessage (&msg);
+            DispatchMessage (&msg);
+        }
+        return msg.wParam;
     }
 
-  /*  // init
+    void StopWin32App ()
-    char * argv[] = { (char *)"i2pd" };
-    Daemon.init(sizeof (argv)/sizeof (argv[0]), argv);
-    // start
-    Daemon.start ();*/
-    // main loop
-    MSG msg;
-    while (GetMessage (&msg, NULL, 0, 0 ))
     {
-        TranslateMessage (&msg);
+         UnregisterClass (I2PD_WIN32_CLASSNAME, GetModuleHandle(NULL));
-        DispatchMessage (&msg);
     }
-   /* // atop
+}
-    Daemon.stop ();*/
+}
-    // terminate
-    UnregisterClass (I2PD_WIN32_CLASSNAME, hInst);
-    return msg.wParam;
- }

Win32/Win32App.h

@@ -3,4 +3,13 @@
 
 #define I2PD_WIN32_CLASSNAME "i2pd main window"
 
+namespace i2p
+{
+namespace win32
+{
+    bool StartWin32App ();
+    void StopWin32App ();
+    int RunWin32App ();
+}
+}
 #endif // WIN32APP_H__