Merge pull request #8 from ntoskrnl7/fix/service-install-method

Fix Service::Install method.
ntoskrnl7 · Aug 18, 2022 · f1a00d5 · f1a00d5
2 parents 0412690 + 3bd367e
commit f1a00d5
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
@@ -70,12 +70,7 @@ jobs:
         working-directory: test/build
 
       - name: Configure CMake
-        if: ${{ (matrix.gen != '') && ((matrix.sys == 'CLANG32') || (matrix.sys == 'CLANG64')) }}
-        run: cmake .. -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -G "${{matrix.gen}}" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
-        working-directory: test/build
-
-      - name: Configure CMake
-        if: ${{ (matrix.gen != '') && (!((matrix.sys == 'CLANG32') || (matrix.sys == 'CLANG64'))) }}
+        if: ${{ (matrix.gen != '') }}
         run: cmake .. -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -G "${{matrix.gen}}"
         working-directory: test/build
 

diff --git a/README.md b/README.md
@@ -213,7 +213,7 @@ add_executable(tests tests.cpp)
 
 # add dependencies
 include(cmake/CPM.cmake)
-CPMAddPackage("gh:ntoskrnl7/win32-ex@0.8.20")
+CPMAddPackage("gh:ntoskrnl7/win32-ex@0.8.21")
 
 # link dependencies
 target_link_libraries(tests win32ex)
@@ -223,13 +223,35 @@ target_link_libraries(tests win32ex)
 
 ```C++
 #include <iostream>
+
 #include <Win32Ex/System/Process.hpp>
+#include <Win32Ex/System/Service.hpp>
 // or #include <Win32Ex.h>
 // or #include <Win32Ex/System.h>
 
+Win32Ex::System::Service SimpleService("SimpleSvc");
+
 int main()
 {
     std::cout << Win32Ex::System::Process::All().size();
+
+    Win32Ex::System::Service::Instance<SimpleService>::Get()
+        .OnStart([]() {
+            // TODO
+        })
+        .OnStop([]() {
+            // TODO
+        })
+        .OnPause([]() {
+            // TODO
+        })
+        .OnContinue([]() {
+            // TODO
+        })
+        .OnError([](DWORD ErrorCode, PCSTR Message) {
+            // TODO
+        })
+        .Run();
     return 0;
 }
 ```
diff --git a/include/Win32Ex/Internal/version.h b/include/Win32Ex/Internal/version.h
@@ -27,6 +27,6 @@ Module Name:
 
 #define WIN32EX_VERSION_MAJOR 0
 #define WIN32EX_VERSION_MINOR 8
-#define WIN32EX_VERSION_PATCH 20
+#define WIN32EX_VERSION_PATCH 21
 
 #endif // _WIN32EX_VERSION_H_
diff --git a/include/Win32Ex/System/Service.hpp b/include/Win32Ex/System/Service.hpp
@@ -534,6 +534,9 @@ template <class _StringType = StringT> class ServiceT
         }
         dependencies.push_back(0);
 
+        if (binaryPathName_.empty())
+            this->BinaryPathName();
+
         if (!handle.Attach(CreateServiceT<CharType>(
                 handle.hSCManager, name_.c_str(), displayName_.empty() ? NULL : displayName_.c_str(),
                 SERVICE_CHANGE_CONFIG, ServiceType, StartType, ErrorControl, binaryPathName_.c_str(),