From 51521cb642358770e94b8f9b4f40dd3b4c827cad Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Fri, 9 Sep 2022 17:50:28 +0200 Subject: Repository clean up, renamed ddk-template* to dpp-example*. * Improved/Added root and examples Makefile * Adapted CIs Signed-off-by: Toni Uhlig --- .circleci/config.yml | 4 +- .github/workflows/build.yml | 8 +- .gitignore | 2 +- .gitlab-ci.yml | 4 +- Makefile | 69 ++++------------- README.md | 2 +- ddk-template-cplusplus-EASTL.bat | 27 ------- ddk-template-cplusplus-EASTL.cpp | 123 ------------------------------ ddk-template-cplusplus.bat | 27 ------- ddk-template-cplusplus.cpp | 126 ------------------------------- ddk-template.bat | 27 ------- ddk-template.c | 21 ------ examples/Makefile | 59 +++++++++++++++ examples/dpp-example-cplusplus-EASTL.bat | 27 +++++++ examples/dpp-example-cplusplus-EASTL.cpp | 123 ++++++++++++++++++++++++++++++ examples/dpp-example-cplusplus.bat | 27 +++++++ examples/dpp-example-cplusplus.cpp | 126 +++++++++++++++++++++++++++++++ examples/dpp-example.bat | 27 +++++++ examples/dpp-example.c | 21 ++++++ 19 files changed, 435 insertions(+), 415 deletions(-) delete mode 100755 ddk-template-cplusplus-EASTL.bat delete mode 100644 ddk-template-cplusplus-EASTL.cpp delete mode 100755 ddk-template-cplusplus.bat delete mode 100644 ddk-template-cplusplus.cpp delete mode 100755 ddk-template.bat delete mode 100644 ddk-template.c create mode 100644 examples/Makefile create mode 100755 examples/dpp-example-cplusplus-EASTL.bat create mode 100644 examples/dpp-example-cplusplus-EASTL.cpp create mode 100755 examples/dpp-example-cplusplus.bat create mode 100644 examples/dpp-example-cplusplus.cpp create mode 100755 examples/dpp-example.bat create mode 100644 examples/dpp-example.c diff --git a/.circleci/config.yml b/.circleci/config.yml index b7285ce..e26ea1a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,10 +24,10 @@ jobs: DDK_INCLUDE_DIR=/usr/x86_64-w64-mingw32/include/ddk - run: | env DEBIAN_FRONTEND=noninteractive \ - make install \ + make examples-install \ WERROR=1 Q= \ CC=/usr/bin/x86_64-w64-mingw32-gcc \ CXX=/usr/bin/x86_64-w64-mingw32-g++ \ RC=/usr/bin/x86_64-w64-mingw32-windres \ DDK_INCLUDE_DIR=/usr/x86_64-w64-mingw32/include/ddk \ - DESTDIR=_install/ + DESTDIR=$(realpath _install) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1501df5..5edbcd4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: run: | sudo apt-get update sudo apt-get install autoconf automake cmake libtool pkg-config gettext flex bison - sudo apt-get install ${{ matrix.compiler }} lcov + sudo apt-get install ${{ matrix.compiler }} lcov osslsigncode - name: Print Help run: | make help @@ -48,7 +48,11 @@ jobs: make deps - name: Build Examples run: | - make all + make examples + - name: Install Examples + run: | + make examples-install DESTDIR=$(realpath _install) + ls -alh _install - name: Cleanup run: | make deps-clean diff --git a/.gitignore b/.gitignore index 40f8e1c..a7d7710 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ /codesign-* /EASTL-build/ /EASTL-native-build/ -/w64-mingw32-sysroot/ +/mingw-w64-sysroot/ /*.o /*.opp /CRT/*.o diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18a362d..f960f88 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,8 +56,8 @@ build: - pwd - mkdir -p ./mingw-w64-build && touch ./mingw-w64-build/mingw-w64-build - touch -m ./mingw-w64-sysroot/x86_64/bin/x86_64-w64-mingw32-gcc - - make -j1 all WERROR=1 Q= - - make -j1 install WERROR=1 Q= DESTDIR=_install + - make -j1 examples WERROR=1 Q= + - make -j1 examples-install WERROR=1 Q= DESTDIR=$(realpath _install) - ls -alh _install artifacts: expire_in: 1 week diff --git a/Makefile b/Makefile index 14da815..5e283bc 100644 --- a/Makefile +++ b/Makefile @@ -1,65 +1,22 @@ -1_DRIVER_NAME = ddk-template -1_OBJECTS = $(1_DRIVER_NAME).o -1_TARGET = $(1_DRIVER_NAME).sys - -2_DRIVER_NAME = ddk-template-cplusplus -2_OBJECTS = $(2_DRIVER_NAME).opp -2_TARGET = $(2_DRIVER_NAME).sys - -3_DRIVER_NAME = ddk-template-cplusplus-EASTL -3_OBJECTS = $(3_DRIVER_NAME).opp -3_TARGET = $(3_DRIVER_NAME).sys - -DPP_ROOT = . -INSTALL = install - -ifndef BUILD_NATIVE - -all: $(1_TARGET) $(2_TARGET) $(3_TARGET) - -include $(DPP_ROOT)/Makefile.inc - -%.o: %.c - $(call BUILD_C_OBJECT,$<,$@) - -%.opp: %.cpp - $(call BUILD_CPP_OBJECT,$<,$@) - -# simple C driver -$(1_TARGET): $(1_OBJECTS) - $(call LINK_C_KERNEL_TARGET,$(1_OBJECTS),$@) - -# C++ driver w/ MT -$(2_TARGET): $(2_OBJECTS) - $(call LINK_CPP_KERNEL_TARGET,$(2_OBJECTS),$@) - -# C++ driver w/ EASTL -$(3_TARGET): $(3_OBJECTS) - $(call LINK_CPP_KERNEL_TARGET,$(3_OBJECTS),$@) - -install: all - $(call INSTALL_EXEC_SIGN,$(1_TARGET)) - $(call INSTALL_EXEC_SIGN,$(2_TARGET)) - $(call INSTALL_EXEC_SIGN,$(3_TARGET)) - $(INSTALL) $(1_DRIVER_NAME).bat $(DESTDIR) - $(INSTALL) $(2_DRIVER_NAME).bat $(DESTDIR) - $(INSTALL) $(3_DRIVER_NAME).bat $(DESTDIR) - -endif - -clean: - rm -f $(1_OBJECTS) $(1_TARGET) $(1_TARGET).map - rm -f $(2_OBJECTS) $(2_TARGET) $(2_TARGET).map - rm -f $(3_OBJECTS) $(3_TARGET) $(3_TARGET).map - # # Targets for building dependencies e.g. mingw-gcc/g++, STL, etc. # +DPP_ROOT = . + ifndef JOBS JOBS := 4 endif +examples: + $(MAKE) -C examples DPP_ROOT=$(realpath $(DPP_ROOT)) all + +examples-clean: + $(MAKE) -C examples DPP_ROOT=$(realpath $(DPP_ROOT)) clean + +examples-install: + $(MAKE) -C examples DPP_ROOT=$(realpath $(DPP_ROOT)) install + deps: $(MAKE) -C $(DPP_ROOT) -f Makefile.deps WERROR=1 JOBS=$(JOBS) Q=$(Q) $(MAKE) -C $(DPP_ROOT) -f Makefile.deps BUILD_NATIVE=1 WERROR=1 JOBS=$(JOBS) Q=$(Q) @@ -73,5 +30,5 @@ deps-clean: help: $(MAKE) -C $(DPP_ROOT) -f Makefile.deps help -.PHONY: all install distclean clean -.DEFAULT_GOAL := all +.PHONY: examples deps deps-distclean deps-clean help +.DEFAULT_GOAL := deps diff --git a/README.md b/README.md index 76d90e4..5ffb386 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Build](https://github.com/utoni/mingw-w64-dpp/actions/workflows/build.yml/badge.svg "Github Actions")](https://github.com/utoni/mingw-w64-dpp/actions/workflows/build.yml) -[![Gitlab-CI](https://gitlab.com/utoni/mingw-w64-dpp/badges/main/pipeline.svg "Gitlab-CI: main branch")](https://gitlab.com/utoni/mingw-w64-dpp/-/pipelines) +[![Gitlab-CI](https://gitlab.com/utoni/mingw-w64-ddk-template/badges/main/pipeline.svg "Gitlab-CI: main branch")](https://gitlab.com/utoni/mingw-w64-ddk-template/-/pipelines) [![Circle-CI](https://circleci.com/gh/utoni/mingw-w64-dpp.svg?style=shield "Circle-CI")](https://app.circleci.com/pipelines/github/utoni/mingw-w64-dpp) # Mingw64 Driver Plus Plus diff --git a/ddk-template-cplusplus-EASTL.bat b/ddk-template-cplusplus-EASTL.bat deleted file mode 100755 index 58d8c5f..0000000 --- a/ddk-template-cplusplus-EASTL.bat +++ /dev/null @@ -1,27 +0,0 @@ -@echo off -set SERVICE_NAME=DDK-Template-CPlusPlus-EASTL -set DRIVER="%~dp0\ddk-template-cplusplus-EASTL.sys" - -net session >nul 2>&1 -if NOT %ERRORLEVEL% EQU 0 ( - echo ERROR: This script requires Administrator privileges! - pause - exit /b 1 -) - -echo --------------------------------------- -echo -- Service Name: %SERVICE_NAME% -echo -- Driver......: %DRIVER% -echo --------------------------------------- - -sc create %SERVICE_NAME% binPath= %DRIVER% type= kernel -echo --------------------------------------- -sc start %SERVICE_NAME% -echo --------------------------------------- -sc query %SERVICE_NAME% -echo [PRESS A KEY TO STOP THE DRIVER] -pause -sc stop %SERVICE_NAME% -sc delete %SERVICE_NAME% -echo Done. -timeout /t 3 diff --git a/ddk-template-cplusplus-EASTL.cpp b/ddk-template-cplusplus-EASTL.cpp deleted file mode 100644 index b57815d..0000000 --- a/ddk-template-cplusplus-EASTL.cpp +++ /dev/null @@ -1,123 +0,0 @@ -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// C&P from: https://raw.githubusercontent.com/sidyhe/dxx/ed06aba3b91fe8e101d08c33c26ba73db96acef0/README.md -void stl_test() -{ - eastl::make_unique(); - eastl::make_shared(); - eastl::scoped_ptr dptr(new double(3.6)); - - eastl::set set_test; - set_test.insert(1); - set_test.insert(3); - set_test.insert(5); - set_test.erase(1); - - eastl::map map_test; - map_test[0] = 1; - map_test[10] = 11; - map_test[20] = 12; - map_test.erase(11); - - eastl::vector vec_test; - vec_test.push_back(2); - vec_test.push_back(3); - vec_test.push_back(1); - eastl::stable_sort(vec_test.begin(), vec_test.end(), eastl::less()); - for (auto e : vec_test) - { - DbgPrint("%d\n", e); - } - - eastl::string s; - s = "This a string"; - s.append(" "); - s.append("any"); - DbgPrint("%s\n", s.c_str()); - - eastl::wstring ws; - ws = L"wide string"; - ws.clear(); - - eastl::unordered_set us_test; - us_test.insert(333); - - eastl::unordered_map um_test; - um_test.insert(eastl::make_pair(6.6, "9.9")); -} - -void more_stl_test() -{ - eastl::hash_map hm; - - hm[0] = "test1"; - hm[10] = "test2"; - hm[20] = "test3"; - for (auto s : hm) - { - DbgPrint("%s\n", s.second.c_str()); - } - - eastl::uniform_int_distribution uid(1, UINT32_MAX); - DbgPrint("PRNG: %u\n", uid); - - auto lambda = [] { DbgPrint("Hello lambda!\n"); }; - eastl::function fn = lambda; - fn(); - - auto lambda2 = [](int n) { - DbgPrint("Hello lambda2, %u!\n", n); - return n; - }; - eastl::function fn2 = lambda2; - fn2(1337); - - eastl::vector fill_me; - for (auto i = UINT16_MAX; i > 0; --i) - { - fill_me.push_back(i); - } - DbgPrint("fill_me size: %zu\n", fill_me.size()); -} - -extern "C" -{ - - DRIVER_INITIALIZE DriverEntry; - DRIVER_UNLOAD DriverUnload; - - NTSTATUS DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) - { - (void)DriverObject; - (void)RegistryPath; - - DbgPrint("%s\n", "Hello ring0!"); - - stl_test(); - more_stl_test(); - - return STATUS_SUCCESS; - } - - VOID DriverUnload(PDRIVER_OBJECT DriverObject) - { - (void)DriverObject; - - DbgPrint("%s\n", "Bye ring0!"); - } -} diff --git a/ddk-template-cplusplus.bat b/ddk-template-cplusplus.bat deleted file mode 100755 index 4ea1ec3..0000000 --- a/ddk-template-cplusplus.bat +++ /dev/null @@ -1,27 +0,0 @@ -@echo off -set SERVICE_NAME=DDK-Template-CPlusPlus -set DRIVER="%~dp0\ddk-template-cplusplus.sys" - -net session >nul 2>&1 -if NOT %ERRORLEVEL% EQU 0 ( - echo ERROR: This script requires Administrator privileges! - pause - exit /b 1 -) - -echo --------------------------------------- -echo -- Service Name: %SERVICE_NAME% -echo -- Driver......: %DRIVER% -echo --------------------------------------- - -sc create %SERVICE_NAME% binPath= %DRIVER% type= kernel -echo --------------------------------------- -sc start %SERVICE_NAME% -echo --------------------------------------- -sc query %SERVICE_NAME% -echo [PRESS A KEY TO STOP THE DRIVER] -pause -sc stop %SERVICE_NAME% -sc delete %SERVICE_NAME% -echo Done. -timeout /t 3 diff --git a/ddk-template-cplusplus.cpp b/ddk-template-cplusplus.cpp deleted file mode 100644 index c1d9b29..0000000 --- a/ddk-template-cplusplus.cpp +++ /dev/null @@ -1,126 +0,0 @@ -#include - -#include - -class TestSmth -{ -public: - TestSmth() - { - DbgPrint("%s\n", "ctor"); - } - ~TestSmth() - { - DbgPrint("%s\n", "dtor"); - } - void doSmth(void) - { - DbgPrint("%s\n", "Hello Class!"); - } -}; -static TestSmth * cdtor_test; - -class Derived : public TestSmth -{ -public: - Derived() - { - } - ~Derived() - { - } - void doSmth(void) - { - DbgPrint("%s\n", "Hello Derived!"); - } -}; - -class DerivedWithCDtor : public Derived -{ -public: - explicit DerivedWithCDtor(unsigned int value) - { - some_value = value; - DbgPrint("%s\n", "DerivedWithCDtor-Ctor."); - } - ~DerivedWithCDtor() - { - DbgPrint("%s\n", "DerivedWithCDtor-Dtor."); - } - void doSmth(void) - { - DbgPrint("SomeValue: %X\n", some_value); - } - -private: - unsigned int some_value = 0; -}; - -static DerivedWithCDtor some_static(0xDEADC0DE); - -struct threadContext -{ - DriverThread::Semaphore sem; - DriverThread::Thread dth; -}; - -static NTSTATUS threadRoutine(PVOID threadContext) -{ - DbgPrint("ThreadRoutine %p, ThreadContext: %p\n", threadRoutine, threadContext); - for (size_t i = 3; i > 0; --i) - { - DbgPrint("ThreadLoop: %zu\n", i); - } - struct threadContext * const ctx = (struct threadContext *)threadContext; - DbgPrint("Fin. ThreadId: %p\n", ctx->dth.GetThreadId()); - ctx->sem.Release(); - DbgPrint("Thread WaitForTermination: 0x%X\n", ctx->dth.WaitForTermination()); // must return STATUS_UNSUCCESSFUL; - - return STATUS_SUCCESS; -} - -static void test_cplusplus(void) -{ - TestSmth t; - t.doSmth(); - Derived d; - d.doSmth(); - - struct threadContext ctx; - ctx.dth.Start(threadRoutine, (PVOID)&ctx); - ctx.sem.Wait(); - DbgPrint("MainThread semaphore signaled.\n"); - ctx.dth.WaitForTermination(); - ctx.dth.WaitForTermination(); - DbgPrint("MainThread EOF\n"); - - some_static.doSmth(); -} - -extern "C" -{ - - DRIVER_INITIALIZE DriverEntry; - DRIVER_UNLOAD DriverUnload; - - NTSTATUS DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) - { - (void)DriverObject; - (void)RegistryPath; - - DbgPrint("%s\n", "Hello ring0!"); - cdtor_test = new TestSmth(); - - test_cplusplus(); - - return STATUS_SUCCESS; - } - - VOID DriverUnload(PDRIVER_OBJECT DriverObject) - { - (void)DriverObject; - - delete cdtor_test; - DbgPrint("%s\n", "Bye ring0!"); - } -} diff --git a/ddk-template.bat b/ddk-template.bat deleted file mode 100755 index f26461c..0000000 --- a/ddk-template.bat +++ /dev/null @@ -1,27 +0,0 @@ -@echo off -set SERVICE_NAME=DDK-Template -set DRIVER="%~dp0\ddk-template.sys" - -net session >nul 2>&1 -if NOT %ERRORLEVEL% EQU 0 ( - echo ERROR: This script requires Administrator privileges! - pause - exit /b 1 -) - -echo --------------------------------------- -echo -- Service Name: %SERVICE_NAME% -echo -- Driver......: %DRIVER% -echo --------------------------------------- - -sc create %SERVICE_NAME% binPath= %DRIVER% type= kernel -echo --------------------------------------- -sc start %SERVICE_NAME% -echo --------------------------------------- -sc query %SERVICE_NAME% -echo [PRESS A KEY TO STOP THE DRIVER] -pause -sc stop %SERVICE_NAME% -sc delete %SERVICE_NAME% -echo Done. -timeout /t 3 diff --git a/ddk-template.c b/ddk-template.c deleted file mode 100644 index 8a14af9..0000000 --- a/ddk-template.c +++ /dev/null @@ -1,21 +0,0 @@ -#include - -DRIVER_INITIALIZE DriverEntry; -DRIVER_UNLOAD DriverUnload; - -NTSTATUS DriverEntry(struct _DRIVER_OBJECT * DriverObject, PUNICODE_STRING RegistryPath) -{ - (void)DriverObject; - (void)RegistryPath; - - DbgPrint("%s\n", "Hello ring0!"); - - return STATUS_SUCCESS; -} - -VOID DriverUnload(struct _DRIVER_OBJECT * DriverObject) -{ - (void)DriverObject; - - DbgPrint("%s\n", "Bye ring0!"); -} diff --git a/examples/Makefile b/examples/Makefile new file mode 100644 index 0000000..d260b22 --- /dev/null +++ b/examples/Makefile @@ -0,0 +1,59 @@ +ifndef DPP_ROOT +$(error DPP_ROOT is undefined, use `make DPP_ROOT=$(realpath ..)`) +endif + +include $(DPP_ROOT)/Makefile.inc + +1_DRIVER_NAME = dpp-example +1_OBJECTS = $(1_DRIVER_NAME).o +1_TARGET = $(1_DRIVER_NAME).sys + +2_DRIVER_NAME = dpp-example-cplusplus +2_OBJECTS = $(2_DRIVER_NAME).opp +2_TARGET = $(2_DRIVER_NAME).sys + +3_DRIVER_NAME = dpp-example-cplusplus-EASTL +3_OBJECTS = $(3_DRIVER_NAME).opp +3_TARGET = $(3_DRIVER_NAME).sys + +ifdef BUILD_NATIVE +$(error There is nothing the build as native executable here..) +endif + +all: $(1_TARGET) $(2_TARGET) $(3_TARGET) + +include $(DPP_ROOT)/Makefile.inc + +%.o: %.c + $(call BUILD_C_OBJECT,$<,$@) + +%.opp: %.cpp + $(call BUILD_CPP_OBJECT,$<,$@) + +# simple C driver +$(1_TARGET): $(1_OBJECTS) + $(call LINK_C_KERNEL_TARGET,$(1_OBJECTS),$@) + +# C++ driver w/ MT +$(2_TARGET): $(2_OBJECTS) + $(call LINK_CPP_KERNEL_TARGET,$(2_OBJECTS),$@) + +# C++ driver w/ EASTL +$(3_TARGET): $(3_OBJECTS) + $(call LINK_CPP_KERNEL_TARGET,$(3_OBJECTS),$@) + +install: all + $(call INSTALL_EXEC_SIGN,$(1_TARGET)) + $(call INSTALL_EXEC_SIGN,$(2_TARGET)) + $(call INSTALL_EXEC_SIGN,$(3_TARGET)) + $(INSTALL) $(1_DRIVER_NAME).bat $(DESTDIR) + $(INSTALL) $(2_DRIVER_NAME).bat $(DESTDIR) + $(INSTALL) $(3_DRIVER_NAME).bat $(DESTDIR) + +clean: + rm -f $(1_OBJECTS) $(1_TARGET) $(1_TARGET).map + rm -f $(2_OBJECTS) $(2_TARGET) $(2_TARGET).map + rm -f $(3_OBJECTS) $(3_TARGET) $(3_TARGET).map + +.PHONY: all install clean +.DEFAULT_GOAL := all diff --git a/examples/dpp-example-cplusplus-EASTL.bat b/examples/dpp-example-cplusplus-EASTL.bat new file mode 100755 index 0000000..9793eee --- /dev/null +++ b/examples/dpp-example-cplusplus-EASTL.bat @@ -0,0 +1,27 @@ +@echo off +set SERVICE_NAME=DPP-Example-CPlusPlus-EASTL +set DRIVER="%~dp0\dpp-example-cplusplus-EASTL.sys" + +net session >nul 2>&1 +if NOT %ERRORLEVEL% EQU 0 ( + echo ERROR: This script requires Administrator privileges! + pause + exit /b 1 +) + +echo --------------------------------------- +echo -- Service Name: %SERVICE_NAME% +echo -- Driver......: %DRIVER% +echo --------------------------------------- + +sc create %SERVICE_NAME% binPath= %DRIVER% type= kernel +echo --------------------------------------- +sc start %SERVICE_NAME% +echo --------------------------------------- +sc query %SERVICE_NAME% +echo [PRESS A KEY TO STOP THE DRIVER] +pause +sc stop %SERVICE_NAME% +sc delete %SERVICE_NAME% +echo Done. +timeout /t 3 diff --git a/examples/dpp-example-cplusplus-EASTL.cpp b/examples/dpp-example-cplusplus-EASTL.cpp new file mode 100644 index 0000000..b57815d --- /dev/null +++ b/examples/dpp-example-cplusplus-EASTL.cpp @@ -0,0 +1,123 @@ +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// C&P from: https://raw.githubusercontent.com/sidyhe/dxx/ed06aba3b91fe8e101d08c33c26ba73db96acef0/README.md +void stl_test() +{ + eastl::make_unique(); + eastl::make_shared(); + eastl::scoped_ptr dptr(new double(3.6)); + + eastl::set set_test; + set_test.insert(1); + set_test.insert(3); + set_test.insert(5); + set_test.erase(1); + + eastl::map map_test; + map_test[0] = 1; + map_test[10] = 11; + map_test[20] = 12; + map_test.erase(11); + + eastl::vector vec_test; + vec_test.push_back(2); + vec_test.push_back(3); + vec_test.push_back(1); + eastl::stable_sort(vec_test.begin(), vec_test.end(), eastl::less()); + for (auto e : vec_test) + { + DbgPrint("%d\n", e); + } + + eastl::string s; + s = "This a string"; + s.append(" "); + s.append("any"); + DbgPrint("%s\n", s.c_str()); + + eastl::wstring ws; + ws = L"wide string"; + ws.clear(); + + eastl::unordered_set us_test; + us_test.insert(333); + + eastl::unordered_map um_test; + um_test.insert(eastl::make_pair(6.6, "9.9")); +} + +void more_stl_test() +{ + eastl::hash_map hm; + + hm[0] = "test1"; + hm[10] = "test2"; + hm[20] = "test3"; + for (auto s : hm) + { + DbgPrint("%s\n", s.second.c_str()); + } + + eastl::uniform_int_distribution uid(1, UINT32_MAX); + DbgPrint("PRNG: %u\n", uid); + + auto lambda = [] { DbgPrint("Hello lambda!\n"); }; + eastl::function fn = lambda; + fn(); + + auto lambda2 = [](int n) { + DbgPrint("Hello lambda2, %u!\n", n); + return n; + }; + eastl::function fn2 = lambda2; + fn2(1337); + + eastl::vector fill_me; + for (auto i = UINT16_MAX; i > 0; --i) + { + fill_me.push_back(i); + } + DbgPrint("fill_me size: %zu\n", fill_me.size()); +} + +extern "C" +{ + + DRIVER_INITIALIZE DriverEntry; + DRIVER_UNLOAD DriverUnload; + + NTSTATUS DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) + { + (void)DriverObject; + (void)RegistryPath; + + DbgPrint("%s\n", "Hello ring0!"); + + stl_test(); + more_stl_test(); + + return STATUS_SUCCESS; + } + + VOID DriverUnload(PDRIVER_OBJECT DriverObject) + { + (void)DriverObject; + + DbgPrint("%s\n", "Bye ring0!"); + } +} diff --git a/examples/dpp-example-cplusplus.bat b/examples/dpp-example-cplusplus.bat new file mode 100755 index 0000000..d19d3bf --- /dev/null +++ b/examples/dpp-example-cplusplus.bat @@ -0,0 +1,27 @@ +@echo off +set SERVICE_NAME=DPP-Example-CPlusPlus +set DRIVER="%~dp0\dpp-example-cplusplus.sys" + +net session >nul 2>&1 +if NOT %ERRORLEVEL% EQU 0 ( + echo ERROR: This script requires Administrator privileges! + pause + exit /b 1 +) + +echo --------------------------------------- +echo -- Service Name: %SERVICE_NAME% +echo -- Driver......: %DRIVER% +echo --------------------------------------- + +sc create %SERVICE_NAME% binPath= %DRIVER% type= kernel +echo --------------------------------------- +sc start %SERVICE_NAME% +echo --------------------------------------- +sc query %SERVICE_NAME% +echo [PRESS A KEY TO STOP THE DRIVER] +pause +sc stop %SERVICE_NAME% +sc delete %SERVICE_NAME% +echo Done. +timeout /t 3 diff --git a/examples/dpp-example-cplusplus.cpp b/examples/dpp-example-cplusplus.cpp new file mode 100644 index 0000000..c1d9b29 --- /dev/null +++ b/examples/dpp-example-cplusplus.cpp @@ -0,0 +1,126 @@ +#include + +#include + +class TestSmth +{ +public: + TestSmth() + { + DbgPrint("%s\n", "ctor"); + } + ~TestSmth() + { + DbgPrint("%s\n", "dtor"); + } + void doSmth(void) + { + DbgPrint("%s\n", "Hello Class!"); + } +}; +static TestSmth * cdtor_test; + +class Derived : public TestSmth +{ +public: + Derived() + { + } + ~Derived() + { + } + void doSmth(void) + { + DbgPrint("%s\n", "Hello Derived!"); + } +}; + +class DerivedWithCDtor : public Derived +{ +public: + explicit DerivedWithCDtor(unsigned int value) + { + some_value = value; + DbgPrint("%s\n", "DerivedWithCDtor-Ctor."); + } + ~DerivedWithCDtor() + { + DbgPrint("%s\n", "DerivedWithCDtor-Dtor."); + } + void doSmth(void) + { + DbgPrint("SomeValue: %X\n", some_value); + } + +private: + unsigned int some_value = 0; +}; + +static DerivedWithCDtor some_static(0xDEADC0DE); + +struct threadContext +{ + DriverThread::Semaphore sem; + DriverThread::Thread dth; +}; + +static NTSTATUS threadRoutine(PVOID threadContext) +{ + DbgPrint("ThreadRoutine %p, ThreadContext: %p\n", threadRoutine, threadContext); + for (size_t i = 3; i > 0; --i) + { + DbgPrint("ThreadLoop: %zu\n", i); + } + struct threadContext * const ctx = (struct threadContext *)threadContext; + DbgPrint("Fin. ThreadId: %p\n", ctx->dth.GetThreadId()); + ctx->sem.Release(); + DbgPrint("Thread WaitForTermination: 0x%X\n", ctx->dth.WaitForTermination()); // must return STATUS_UNSUCCESSFUL; + + return STATUS_SUCCESS; +} + +static void test_cplusplus(void) +{ + TestSmth t; + t.doSmth(); + Derived d; + d.doSmth(); + + struct threadContext ctx; + ctx.dth.Start(threadRoutine, (PVOID)&ctx); + ctx.sem.Wait(); + DbgPrint("MainThread semaphore signaled.\n"); + ctx.dth.WaitForTermination(); + ctx.dth.WaitForTermination(); + DbgPrint("MainThread EOF\n"); + + some_static.doSmth(); +} + +extern "C" +{ + + DRIVER_INITIALIZE DriverEntry; + DRIVER_UNLOAD DriverUnload; + + NTSTATUS DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) + { + (void)DriverObject; + (void)RegistryPath; + + DbgPrint("%s\n", "Hello ring0!"); + cdtor_test = new TestSmth(); + + test_cplusplus(); + + return STATUS_SUCCESS; + } + + VOID DriverUnload(PDRIVER_OBJECT DriverObject) + { + (void)DriverObject; + + delete cdtor_test; + DbgPrint("%s\n", "Bye ring0!"); + } +} diff --git a/examples/dpp-example.bat b/examples/dpp-example.bat new file mode 100755 index 0000000..cada015 --- /dev/null +++ b/examples/dpp-example.bat @@ -0,0 +1,27 @@ +@echo off +set SERVICE_NAME=DPP-Example +set DRIVER="%~dp0\dpp-example.sys" + +net session >nul 2>&1 +if NOT %ERRORLEVEL% EQU 0 ( + echo ERROR: This script requires Administrator privileges! + pause + exit /b 1 +) + +echo --------------------------------------- +echo -- Service Name: %SERVICE_NAME% +echo -- Driver......: %DRIVER% +echo --------------------------------------- + +sc create %SERVICE_NAME% binPath= %DRIVER% type= kernel +echo --------------------------------------- +sc start %SERVICE_NAME% +echo --------------------------------------- +sc query %SERVICE_NAME% +echo [PRESS A KEY TO STOP THE DRIVER] +pause +sc stop %SERVICE_NAME% +sc delete %SERVICE_NAME% +echo Done. +timeout /t 3 diff --git a/examples/dpp-example.c b/examples/dpp-example.c new file mode 100644 index 0000000..8a14af9 --- /dev/null +++ b/examples/dpp-example.c @@ -0,0 +1,21 @@ +#include + +DRIVER_INITIALIZE DriverEntry; +DRIVER_UNLOAD DriverUnload; + +NTSTATUS DriverEntry(struct _DRIVER_OBJECT * DriverObject, PUNICODE_STRING RegistryPath) +{ + (void)DriverObject; + (void)RegistryPath; + + DbgPrint("%s\n", "Hello ring0!"); + + return STATUS_SUCCESS; +} + +VOID DriverUnload(struct _DRIVER_OBJECT * DriverObject) +{ + (void)DriverObject; + + DbgPrint("%s\n", "Bye ring0!"); +} -- cgit v1.2.3