Merge pull request #1 from bb107/service

Service

Author: bb107

OfficeActivator/Mutex.cpp

@@ -0,0 +1,24 @@
+#include "pch.h"
+#include "Mutex.h"
+#include <sddl.h>
+#pragma comment(lib,"Advapi32.lib")
+
+#define OA_MUTEX_NAME	_T("Global\\OfficeActivatorMutex")
+
+HANDLE WINAPI CreateGlobalMutex() {
+    HANDLE mutex = nullptr;
+    WCHAR* pszStringSecurityDescriptor = L"D:(A;;GA;;;WD)(A;;GA;;;AN)S:(ML;;NW;;;ME)";
+    PSECURITY_DESCRIPTOR pSecDesc;
+
+    if (ConvertStringSecurityDescriptorToSecurityDescriptor(pszStringSecurityDescriptor, SDDL_REVISION_1, &pSecDesc, NULL)) {
+        SECURITY_ATTRIBUTES SecAttr;
+        SecAttr.nLength = sizeof(SECURITY_ATTRIBUTES);
+        SecAttr.lpSecurityDescriptor = pSecDesc;
+        SecAttr.bInheritHandle = FALSE;
+
+        mutex = CreateMutex(&SecAttr, FALSE, OA_MUTEX_NAME);
+        LocalFree(pSecDesc);
+    }
+
+    return mutex;
+}

OfficeActivator/Mutex.h

@@ -0,0 +1,3 @@
+#pragma once
+
+HANDLE WINAPI CreateGlobalMutex();

OfficeActivator/OfficeActivator.cpp

@@ -7,6 +7,7 @@
 #include "OfficeActivator.h"
 #include "OfficeActivatorDlg.h"
 #include "Sppc.h"
+#include "Service.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -20,6 +21,10 @@ COfficeActivatorApp theApp;
 
 BOOL COfficeActivatorApp::InitInstance()
 {
+	if (SvcRun()) {
+		return FALSE;
+	}
+
 	INITCOMMONCONTROLSEX InitCtrls;
 	InitCtrls.dwSize = sizeof(InitCtrls);
 	InitCtrls.dwICC = ICC_WIN95_CLASSES;

OfficeActivator/OfficeActivator.rc

@@ -191,18 +191,23 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="ServiceManageDlg.h" />
     <ClInclude Include="framework.h" />
     <ClInclude Include="Helps.h" />
+    <ClInclude Include="Mutex.h" />
     <ClInclude Include="OfficeActivator.h" />
     <ClInclude Include="OfficeActivatorDlg.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="PeFile.h" />
     <ClInclude Include="Resource.h" />
+    <ClInclude Include="Service.h" />
     <ClInclude Include="Sppc.h" />
     <ClInclude Include="targetver.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="ServiceManageDlg.cpp" />
     <ClCompile Include="Helps.cpp" />
+    <ClCompile Include="Mutex.cpp" />
     <ClCompile Include="OfficeActivator.cpp" />
     <ClCompile Include="OfficeActivatorDlg.cpp" />
     <ClCompile Include="pch.cpp">
@@ -212,6 +217,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="PeFile.cpp" />
+    <ClCompile Include="Service.cpp" />
     <ClCompile Include="Sppc.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -223,6 +229,7 @@
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\screenshots\main.png" />
+    <Image Include="..\screenshots\sc.png" />
     <Image Include="res\OfficeActivator.ico" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

OfficeActivator/OfficeActivator.vcxproj

@@ -48,6 +48,15 @@
     <ClInclude Include="Sppc.h">
       <Filter>Header Files\Helps</Filter>
     </ClInclude>
+    <ClInclude Include="Service.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Mutex.h">
+      <Filter>Header Files\Helps</Filter>
+    </ClInclude>
+    <ClInclude Include="ServiceManageDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="OfficeActivator.cpp">
@@ -68,6 +77,15 @@
     <ClCompile Include="Sppc.cpp">
       <Filter>Source Files\Helps</Filter>
     </ClCompile>
+    <ClCompile Include="Service.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Mutex.cpp">
+      <Filter>Source Files\Helps</Filter>
+    </ClCompile>
+    <ClCompile Include="ServiceManageDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="OfficeActivator.rc">
@@ -89,5 +107,8 @@
     <Image Include="..\screenshots\main.png">
       <Filter>Resource Files</Filter>
     </Image>
+    <Image Include="..\screenshots\sc.png">
+      <Filter>Resource Files</Filter>
+    </Image>
   </ItemGroup>
 </Project>

OfficeActivator/OfficeActivator.vcxproj.filters

@@ -6,6 +6,9 @@
 #include "Helps.h"
 #include "PeFile.h"
 #include "Sppc.h"
+#include "Mutex.h"
+#include <winsvc.h>
+#include "ServiceManageDlg.h"
 #include <vector>
 #include <map>
 
@@ -36,6 +39,7 @@ LPCTSTR g_TypeTable[] = {
 	_T("ul.xrm-ms"),
 	_T("pl.xrm-ms"),
 };
+HANDLE g_Mutex;
 
 typedef struct _OSP_LICENSE {
 
@@ -283,6 +287,9 @@ BOOL COfficeActivatorDlg::OnInitDialog()
 	SetIcon(m_hIcon, TRUE);			// Set big icon
 	SetIcon(m_hIcon, FALSE);		// Set small icon
 
+	g_Mutex = CreateGlobalMutex();
+	ASSERT(g_Mutex);
+
 	CListCtrl* list = static_cast<CListCtrl*>(GetDlgItem(IDC_LIST_INSTALLED_LICENSE));
 	ASSERT(list);
 	InitializeListControl(list);
@@ -293,7 +300,7 @@ BOOL COfficeActivatorDlg::OnInitDialog()
 	InitializeProductKeyList(pks);
 
 	if (!IsUserAnAdmin()) {
-		int buttons[] = { IDC_BUTTON_PATCH,IDC_BUTTON_RESTORE,IDC_BUTTON_INSTALL_PKEY,IDC_BUTTON_INSTALL_LIC,IDC_BUTTON_UNINSTALL_LIC,IDC_BUTTON_UNINSTALL_PKEY };
+		int buttons[] = { IDC_BUTTON_PATCH,IDC_BUTTON_RESTORE,IDC_BUTTON_INSTALL_PKEY,IDC_BUTTON_INSTALL_LIC,IDC_BUTTON_UNINSTALL_LIC,IDC_BUTTON_UNINSTALL_PKEY, IDC_BUTTON_SVC_MANAGE };
 		for (int i = 0; i < sizeof(buttons) / sizeof(int); ++i) {
 			CButton* btn = static_cast<CButton*>(GetDlgItem(buttons[i]));
 			ASSERT(btn);
@@ -336,7 +343,8 @@ BEGIN_MESSAGE_MAP(COfficeActivatorDlg, CDialogEx)
 	ON_CBN_SELCHANGE(IDC_COMBO_LICENSES_VERSION, &COfficeActivatorDlg::OnCbnSelchangeComboLicensesVersion)
 	ON_BN_CLICKED(IDC_BUTTON_INSTALL_LIC, &COfficeActivatorDlg::OnBnClickedButtonInstallLic)
 	ON_BN_CLICKED(IDC_BUTTON_UNINSTALL_LIC, &COfficeActivatorDlg::OnBnClickedButtonUninstallLic)
-	
+	ON_BN_CLICKED(IDC_BUTTON_SVC_MANAGE, &COfficeActivatorDlg::OnBnClickedButtonSvcManage)
+
 	ON_WM_CTLCOLOR()
 END_MESSAGE_MAP()
 
@@ -415,6 +423,8 @@ void COfficeActivatorDlg::OnBnClickedButtonAutoDetect()
 
 void COfficeActivatorDlg::OnBnClickedButtonCheckPatchStatus()
 {
+	WaitForSingleObject(g_Mutex, INFINITE);
+
 	DWORD checkResult = 0;
 	CString officePath, msoPath;
 	if (GetDlgItemText(IDC_EDIT_OFFICE_PATH, officePath) == 0 ||
@@ -483,14 +493,12 @@ void COfficeActivatorDlg::OnBnClickedButtonCheckPatchStatus()
 
 	officePatch->Invalidate();
 	msoPatch->Invalidate();
+
+	ReleaseMutex(g_Mutex);
 }
 
-void COfficeActivatorDlg::OnBnClickedButtonPatch()
+void COfficeActivatorDlg::OnBnClickedButtonPatchInternal()
 {
-	if (MessageBox(_T("DO YOU REALLY WANT TO APPLY PATCH?"), _T("WARNING"), MB_YESNOCANCEL | MB_ICONWARNING) != IDYES) {
-		return;
-	}
-
 	if (m_PatchState == ~0) {
 		MessageBox(_T("Please check patch state first!"), _T("Error"));
 		return;
@@ -576,16 +584,27 @@ void COfficeActivatorDlg::OnBnClickedButtonPatch()
 		}
 
 	} while (false);
-
-	OnBnClickedButtonCheckPatchStatus();
 }
 
-void COfficeActivatorDlg::OnBnClickedButtonRestore()
-{
-	if (MessageBox(_T("DO YOU REALLY WANT TO RESTORE PATCH?"), _T("WARNING"), MB_YESNOCANCEL | MB_ICONWARNING) != IDYES) {
+void COfficeActivatorDlg::OnBnClickedButtonPatch() {
+	if (MessageBox(_T("DO YOU REALLY WANT TO APPLY PATCH?"), _T("WARNING"), MB_YESNOCANCEL | MB_ICONWARNING) != IDYES) {
 		return;
 	}
 
+	WaitForSingleObject(g_Mutex, INFINITE);
+	OnBnClickedButtonCheckPatchStatus();
+
+	__try {
+		OnBnClickedButtonPatchInternal();
+	}
+	__finally {
+		OnBnClickedButtonCheckPatchStatus();
+		ReleaseMutex(g_Mutex);
+	}
+}
+
+void COfficeActivatorDlg::OnBnClickedButtonRestoreInternal()
+{
 	if (m_PatchState == ~0) {
 		MessageBox(_T("Please check patch state first!"), _T("Error"));
 		return;
@@ -636,11 +655,26 @@ void COfficeActivatorDlg::OnBnClickedButtonRestore()
 			return;
 		}
 	}
+}
 
-	//
-	// Update patch status.
-	//
+void COfficeActivatorDlg::OnBnClickedButtonRestore() {
+	if (MessageBox(_T("DO YOU REALLY WANT TO RESTORE PATCH?\n(Maybe you need disable or delete OfficeActivatorSvc)"), _T("WARNING"), MB_YESNOCANCEL | MB_ICONWARNING) != IDYES) {
+		return;
+	}
+
+	WaitForSingleObject(g_Mutex, INFINITE);
 	OnBnClickedButtonCheckPatchStatus();
+
+	__try {
+		OnBnClickedButtonRestoreInternal();
+	}
+	__finally {
+		//
+		// Update patch status.
+		//
+		OnBnClickedButtonCheckPatchStatus();
+		ReleaseMutex(g_Mutex);
+	}
 }
 
 void COfficeActivatorDlg::OnBnClickedButtonUpdateLic()
@@ -888,3 +922,23 @@ void COfficeActivatorDlg::OnBnClickedButtonUninstallLic()
 
 	OnBnClickedButtonUpdateLic();
 }
+
+void COfficeActivatorDlg::OnBnClickedButtonSvcManage()
+{
+	CString app;
+	CString mso;
+	GetDlgItemText(IDC_EDIT_MSO_PATH, mso);
+
+	if (mso.GetLength() == 0) {
+		MessageBox(_T("Please select the location of the MSO.DLL file."), _T("Info"), MB_OK);
+		return;
+	}
+
+	AfxGetModuleFileName(AfxGetInstanceHandle(), app);
+
+	CString path;
+	path.Format(_T("%s -mso \"%s\""), (LPCTSTR)app, (LPCTSTR)mso);
+
+	CServiceManageDlg dlg(path);
+	dlg.DoModal();
+}

OfficeActivator/OfficeActivatorDlg.cpp

@@ -28,6 +28,9 @@ class COfficeActivatorDlg : public CDialogEx
 
 	VOID AutoDetectOffice();
 
+	void OnBnClickedButtonPatchInternal();
+	void OnBnClickedButtonRestoreInternal();
+
 // Implementation
 protected:
 	HICON m_hIcon;
@@ -51,4 +54,5 @@ class COfficeActivatorDlg : public CDialogEx
 	afx_msg void OnCbnSelchangeComboLicensesVersion();
 	afx_msg void OnBnClickedButtonInstallLic();
 	afx_msg void OnBnClickedButtonUninstallLic();
+	afx_msg void OnBnClickedButtonSvcManage();
 };