Merge pull request #54 from FFMG/develop

Develop

Author: FFMG

monitor/ActionMonitor/Action.cpp

@@ -126,7 +126,7 @@ void Action::SetCommandPath(const std::wstring& szPath )
  * \param isPrivileged if we need administrator privilege to run this.
  * \return BOOL true.
  */
-ActiveAction* Action::CreateActiveAction(CWnd* pWnd, const std::wstring& szCommandLine, const bool isPrivileged) const
+ActiveAction* Action::CreateActiveAction(IVirtualMachines& virtualMachines, CWnd* pWnd, const std::wstring& szCommandLine, const bool isPrivileged) const
 {
   //  not sure how to do that...
   if ( Len() == 0)
@@ -144,12 +144,12 @@ ActiveAction* Action::CreateActiveAction(CWnd* pWnd, const std::wstring& szComma
   ActiveAction* aa;
   if( szCommandLine.length() == 0 )
   {
-    aa = CreateActiveActionWithNoCommandLine( pWnd, isPrivileged);
+    aa = CreateActiveActionWithNoCommandLine( virtualMachines, pWnd, isPrivileged);
   }
   else
   {
     //  so now, at last we can call the command line
-    aa = CreateActiveActionDirect( pWnd, szCommandLine.c_str(), isPrivileged);
+    aa = CreateActiveActionDirect( virtualMachines, pWnd, szCommandLine.c_str(), isPrivileged);
   }
 
   // now that we are back from calling the plugin, restore the keyboard state.
@@ -164,7 +164,7 @@ ActiveAction* Action::CreateActiveAction(CWnd* pWnd, const std::wstring& szComma
  * \param isPrivileged if this action is privileged or not.
  * \return bool success or not.
  */
-ActiveAction* Action::CreateActiveActionWithNoCommandLine(CWnd* pWnd, const bool isPrivileged ) const
+ActiveAction* Action::CreateActiveActionWithNoCommandLine(IVirtualMachines& virtualMachines, CWnd* pWnd, const bool isPrivileged ) const
 {
   //  the command line we will try and make.
   std::wstring szCommandLine = L"";
@@ -209,7 +209,7 @@ ActiveAction* Action::CreateActiveActionWithNoCommandLine(CWnd* pWnd, const bool
   }
 
   // we can now do it direct.
-  return CreateActiveActionDirect( pWnd, szCommandLine, isPrivileged);
+  return CreateActiveActionDirect( virtualMachines, pWnd, szCommandLine, isPrivileged);
 }
 
 /**
@@ -367,7 +367,7 @@ bool Action::Execute(const std::vector<std::wstring>& argv, const bool isPrivile
  * \param isPrivileged if we need administrator privilege to run this.
  * \return TRUE|FALSE success or not.
  */
-ActiveAction* Action::CreateActiveActionDirect(CWnd* pWnd, const std::wstring& szCommandLine, const bool isPrivileged) const
+ActiveAction* Action::CreateActiveActionDirect(IVirtualMachines& virtualMachines, CWnd* pWnd, const std::wstring& szCommandLine, const bool isPrivileged) const
 {
   // sanity check
   if (0 == _szFile.length())
@@ -383,7 +383,7 @@ ActiveAction* Action::CreateActiveActionDirect(CWnd* pWnd, const std::wstring& s
   //
   if (LuaVirtualMachine::IsExt(_szFile ))
   {
-    auto ala = new ActiveLuaAction(*this, hTopHWnd, szCommandLine, isPrivileged);
+    auto ala = new ActiveLuaAction(*this, virtualMachines, hTopHWnd, szCommandLine, isPrivileged);
     if (ala->Initialize())
     {
       return ala;
@@ -399,7 +399,7 @@ ActiveAction* Action::CreateActiveActionDirect(CWnd* pWnd, const std::wstring& s
   //
   if (PythonVirtualMachine::IsExt(_szFile))
   {
-    auto apa = new ActivePythonAction(*this, hTopHWnd, szCommandLine, isPrivileged);
+    auto apa = new ActivePythonAction(*this, virtualMachines, hTopHWnd, szCommandLine, isPrivileged);
     if(apa->Initialize() )
     { 
       return apa;
@@ -415,13 +415,13 @@ ActiveAction* Action::CreateActiveActionDirect(CWnd* pWnd, const std::wstring& s
   //
   if (PowershellVirtualMachine::IsExt(_szFile))
   {
-    auto apa = new ActivePowershellAction(*this, hTopHWnd, szCommandLine, isPrivileged);
+    auto apa = new ActivePowershellAction(*this, virtualMachines, hTopHWnd, szCommandLine, isPrivileged);
     if (apa->Initialize())
     {
       return apa;
     }
 
-    // did not work, try the default way...
+    // did not work, try the default way...`
     delete apa;
   }
 #endif // ACTIONMONITOR_PS_PLUGIN
@@ -431,7 +431,7 @@ ActiveAction* Action::CreateActiveActionDirect(CWnd* pWnd, const std::wstring& s
   //
   if (ShellVirtualMachine::IsExt(_szFile))
   {
-    auto asa = new ActiveShellAction(*this, hTopHWnd, szCommandLine, isPrivileged);
+    auto asa = new ActiveShellAction(*this, virtualMachines, hTopHWnd, szCommandLine, isPrivileged);
     if (asa->Initialize())
     {
       return asa;
@@ -447,7 +447,7 @@ ActiveAction* Action::CreateActiveActionDirect(CWnd* pWnd, const std::wstring& s
   //
   if (CsVirtualMachine::IsExt(_szFile))
   {
-    auto acsa = new ActiveCsAction(*this, hTopHWnd, szCommandLine, isPrivileged);
+    auto acsa = new ActiveCsAction(*this, virtualMachines, hTopHWnd, szCommandLine, isPrivileged);
     if (acsa->Initialize())
     {
       return acsa;
@@ -463,7 +463,7 @@ ActiveAction* Action::CreateActiveActionDirect(CWnd* pWnd, const std::wstring& s
   //
   if (PluginVirtualMachine::IsExt(_szFile))
   {
-    auto apa = new ActivePluginAction(*this, hTopHWnd, szCommandLine, isPrivileged);
+    auto apa = new ActivePluginAction(*this, virtualMachines, hTopHWnd, szCommandLine, isPrivileged);
     if (apa->Initialize())
     {
       return apa;
@@ -477,21 +477,21 @@ ActiveAction* Action::CreateActiveActionDirect(CWnd* pWnd, const std::wstring& s
   // Batch files...
   if( myodd::files::IsExtension (_szFile, _T("bat")))
   {
-    return new ActiveBatchAction(*this, hTopHWnd, szCommandLine );
+    return new ActiveBatchAction(*this, virtualMachines, hTopHWnd, szCommandLine );
   }
   if (myodd::files::IsExtension(_szFile, _T("cmd")))
   {
-    return new ActiveCmdAction(*this, hTopHWnd, szCommandLine);
+    return new ActiveCmdAction(*this, virtualMachines, hTopHWnd, szCommandLine);
   }
   if (myodd::files::IsExtension(_szFile, _T("com")))
   {
-    return new ActiveComAction(*this, hTopHWnd, szCommandLine);
+    return new ActiveComAction(*this, virtualMachines, hTopHWnd, szCommandLine);
   }
   if (myodd::files::IsExtension(_szFile, _T("exe")))
   {
-    return new ActiveExeAction(*this, hTopHWnd, szCommandLine, isPrivileged);
+    return new ActiveExeAction(*this, virtualMachines, hTopHWnd, szCommandLine, isPrivileged);
   }
 
   // run the default action.
-  return new ActiveDefaultAction( *this, hTopHWnd, szCommandLine, isPrivileged );
+  return new ActiveDefaultAction( *this, virtualMachines, hTopHWnd, szCommandLine, isPrivileged );
 }

monitor/ActionMonitor/Action.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vector>
+#include "../api/IVirtualMachines.h"
 
 class ActiveAction;
 class Action  
@@ -22,11 +23,11 @@ class Action
 
   // Do that action with the arguments passed
   // if we have no argument then we look in the clipboard
-  virtual ActiveAction* CreateActiveAction(CWnd* pWnd, const std::wstring& szCommandLine, bool isPrivileged) const;
+  virtual ActiveAction* CreateActiveAction(IVirtualMachines& virtualMachines, CWnd* pWnd, const std::wstring& szCommandLine, bool isPrivileged) const;
 
   // Same as CreateActiveAction( ... ) but we don't get anything from the clipboard
   // only will use what was given to us without further checks.
-  ActiveAction* CreateActiveActionDirect(CWnd* pWnd, const std::wstring& szCommandLine, bool isPrivileged ) const;
+  ActiveAction* CreateActiveActionDirect( IVirtualMachines& virtualMachines, CWnd* pWnd, const std::wstring& szCommandLine, bool isPrivileged ) const;
 
   /**
    * \brief get the command string
@@ -39,7 +40,7 @@ class Action
   size_t Len() const { return _szCommand.length();}
 
 protected:
-  ActiveAction* CreateActiveActionWithNoCommandLine(CWnd* pWnd, bool isPrivileged ) const;
+  ActiveAction* CreateActiveActionWithNoCommandLine(IVirtualMachines& virtualMachines, CWnd* pWnd, bool isPrivileged ) const;
 
   /**
    * \brief convert a multi line piece of text to a single line.

monitor/ActionMonitor/ActionBye.cpp

@@ -1,38 +1,45 @@
-// Action.cpp: implementation of the Action class.
+//This file is part of Myoddweb.Piger.
 //
-//////////////////////////////////////////////////////////////////////
-
+//    Myoddweb.Piger is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    Myoddweb.Piger is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with Myoddweb.Piger.  If not, see<https://www.gnu.org/licenses/gpl-3.0.en.html>.
 #include "stdafx.h"
 #include "ActionBye.h"
 #include "ActionsCore.h"
 #include "ActiveByeAction.h"
 
 /**
- * todo
- * @param void
- * @return void
+ * \brief Constructor
+ * \param application the application to close the app
  */
-ActionBye::ActionBye( ) : Action( ACTION_CORE_BYE, L"" )
+ActionBye::ActionBye(IApplication& application ) : 
+  Action( ACTION_CORE_BYE, L"" ),
+  _application(application)
 {
 }
 
 /**
- * Destructor
- * @param void
- * @return void
+ * \copydoc
  */
 ActionBye::~ActionBye()
 {
 }
 
 /**
- * Run the command, we take into account the current selection and command parameters given.
- * @param HWND hTopWindow the last foreground window
- * @return BOOL true.
+ * \copydoc
  */
-ActiveAction* ActionBye::CreateActiveAction(CWnd* pWnd, const MYODD_STRING& szCommandLine, bool isPrivileged) const
+ActiveAction* ActionBye::CreateActiveAction(IVirtualMachines& virtualMachines, CWnd* pWnd, const MYODD_STRING& szCommandLine, bool isPrivileged) const
 {
   //  get the last forground window handle
-  HWND hTopHWnd = pWnd ? pWnd->GetSafeHwnd() : NULL;
-  return new ActiveByeAction( *this, hTopHWnd );
+  const auto hTopHWnd = pWnd ? pWnd->GetSafeHwnd() : nullptr;
+  return new ActiveByeAction( _application, *this, virtualMachines, hTopHWnd );
 }

monitor/ActionMonitor/ActionBye.h

@@ -1,20 +1,30 @@
-// Action.h: interface for the Action class.
+//This file is part of Myoddweb.Piger.
 //
-//////////////////////////////////////////////////////////////////////
-
-#ifndef __ActionBye_h__
-#define __ActionBye_h__
+//    Myoddweb.Piger is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    Myoddweb.Piger is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with Myoddweb.Piger.  If not, see<https://www.gnu.org/licenses/gpl-3.0.en.html>.
 #pragma once
 
 #include "Action.h"
+#include "IApplication.h"
 
-class ActionBye : public Action
+class ActionBye final : public Action
 {
 public:
-  ActionBye();
+  explicit ActionBye(IApplication& application);
 	virtual ~ActionBye();
 
-  virtual ActiveAction* CreateActiveAction(CWnd* pWnd, const MYODD_STRING& szCommandLine, bool isPrivileged) const;
-};
+  ActiveAction* CreateActiveAction(IVirtualMachines& virtualMachines, CWnd* pWnd, const MYODD_STRING& szCommandLine, bool isPrivileged) const override;
 
-#endif // __Action_h__
+private:
+  IApplication& _application;
+};

monitor/ActionMonitor/ActionLoad.cpp

@@ -1,39 +1,47 @@
-// Action.cpp: implementation of the Action class.
+//This file is part of Myoddweb.Piger.
 //
-//////////////////////////////////////////////////////////////////////
-
+//    Myoddweb.Piger is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    Myoddweb.Piger is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with Myoddweb.Piger.  If not, see<https://www.gnu.org/licenses/gpl-3.0.en.html>.
 #include "stdafx.h"
 #include "ActionLoad.h"
 #include "ActionsCore.h"
-#include "ActiveUserMessageAction.h"
+#include "ActiveLoadAction.h"
 
 /**
- * todo
- * @param void
- * @return void
+ * \brief Constructor
+ * \param application the application to close the app
  */
-ActionLoad::ActionLoad( ) : Action( ACTION_CORE_LOAD, L"")
+ActionLoad::ActionLoad(IApplication& application) :
+  Action( ACTION_CORE_LOAD, L""),
+  _application(application)
 {
 }
 
 /**
- * Destructor
- * @param void
- * @return void
+ * \copydoc
  */
 ActionLoad::~ActionLoad()
 {
 }
 
 /**
- * Run the command, we take into account the current selection and command parameters given.
- * @param const MYODD_STRING& szCommandLine the command line argument.
- * @param bool isPrivileged if we need administrator privilege to run this.
- * @return BOOL true.
+ * \copydoc
  */
-ActiveAction* ActionLoad::CreateActiveAction(CWnd* pWnd, const MYODD_STRING& szCommandLine, bool isPrivileged) const
+ActiveAction* ActionLoad::CreateActiveAction(IVirtualMachines& virtualMachines, CWnd* pWnd, const MYODD_STRING& szCommandLine, bool isPrivileged) const
 {
   //  get the last forground window handle
-  auto hTopHWnd = pWnd ? pWnd->GetSafeHwnd() : NULL;
-  return new ActiveUserMessageAction(*this, hTopHWnd, UWM_KEYBOARD_RELOAD);
+  const auto hTopHWnd = pWnd ? pWnd->GetSafeHwnd() : nullptr;
+
+  //  display the version.
+  return new ActiveLoadAction(_application, *this, virtualMachines, hTopHWnd);
 }

monitor/ActionMonitor/ActionLoad.h

@@ -1,20 +1,29 @@
-// Action.h: interface for the Action class.
+//This file is part of Myoddweb.Piger.
 //
-//////////////////////////////////////////////////////////////////////
-
-#ifndef __ActionLoad_h__
-#define __ActionLoad_h__
+//    Myoddweb.Piger is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    Myoddweb.Piger is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with Myoddweb.Piger.  If not, see<https://www.gnu.org/licenses/gpl-3.0.en.html>.
 #pragma once
-
+#include "IApplication.h"
 #include "Action.h"
 
-class ActionLoad : public Action
+class ActionLoad final : public Action
 {
 public:
-  ActionLoad();
+  explicit ActionLoad(IApplication& application);
 	virtual ~ActionLoad();
 
-  virtual ActiveAction* CreateActiveAction(CWnd* pWnd, const MYODD_STRING& szCommandLine, bool isPrivileged) const;
-};
+  ActiveAction* CreateActiveAction(IVirtualMachines& virtualMachines, CWnd* pWnd, const MYODD_STRING& szCommandLine, bool isPrivileged) const override;
 
-#endif // __Action_h__
+private:
+  IApplication& _application;
+};