aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToni Uhlig <matzeton@googlemail.com>2021-08-01 14:08:11 +0200
committerToni Uhlig <matzeton@googlemail.com>2021-08-01 14:42:46 +0200
commit31486d98f42d6e8a9e6b07d4576c4e781c25bee7 (patch)
tree819cdf7f370b61fe18239023e22779925a00cca4
parent6cea00b3248f8db19acd21644aa2f290a1644cd5 (diff)
Circle-CI
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
-rw-r--r--.circleci/config.yml23
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--CRT/kcrt.c8
-rw-r--r--README.md1
-rw-r--r--ddk-template-cplusplus-EASTL.cpp4
-rw-r--r--ddk-template-cplusplus.cpp4
-rw-r--r--ddk-template.c10
7 files changed, 36 insertions, 18 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..22934cd
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,23 @@
+version: 2.1
+
+jobs:
+ build:
+ docker:
+ - image: ubuntu:latest
+ steps:
+ - checkout
+ - run: export DEBIAN_FRONTEND=noninteractive
+ - run: apt-get update -qq
+ - run: |
+ env DEBIAN_FRONTEND=noninteractive \
+ apt-get install -y -qq \
+ coreutils wget tar gzip bzip2 patch cmake make binutils gcc g++ autoconf automake flex bison texinfo \
+ git subversion curl xz-utils osslsigncode \
+ binutils-mingw-w64-x86-64 gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64-x86-64-dev
+ - run: |
+ env DEBIAN_FRONTEND=noninteractive \
+ make install \
+ WERROR=1 Q= \
+ CC=/usr/bin/x86_64-w64-mingw32-gcc \
+ DDK_INCLUDE_DIR=/usr/x86_64-w64-mingw32/include/ddk \
+ DESTDIR=_install/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd01f55..cbd90c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,11 +47,11 @@ build:
- ls -alh x86_64-w64-mingw32/bin/
- pwd
- >
- make all \
+ make all WERROR=1 Q= \
CC=x86_64-w64-mingw32/bin/x86_64-w64-mingw32-gcc \
DDK_INCLUDE_DIR=x86_64-w64-mingw32/x86_64-w64-mingw32/include/ddk
- >
- make install \
+ make install WERROR=1 Q= \
CC=x86_64-w64-mingw32/bin/x86_64-w64-mingw32-gcc \
DDK_INCLUDE_DIR=x86_64-w64-mingw32/x86_64-w64-mingw32/include/ddk \
DESTDIR=_install/
diff --git a/CRT/kcrt.c b/CRT/kcrt.c
index f2ea550..fff767d 100644
--- a/CRT/kcrt.c
+++ b/CRT/kcrt.c
@@ -10,8 +10,8 @@
extern void (*__CTOR_LIST__)();
extern void (*__DTOR_LIST__)();
-extern NTSTATUS __cdecl DriverEntry(_In_ struct _DRIVER_OBJECT * DriverObject, _In_ PUNICODE_STRING RegistryPath);
-extern void __cdecl DriverUnload(_In_ struct _DRIVER_OBJECT * DriverObject);
+extern NTSTATUS __cdecl DriverEntry(struct _DRIVER_OBJECT * DriverObject, PUNICODE_STRING RegistryPath);
+extern void __cdecl DriverUnload(struct _DRIVER_OBJECT * DriverObject);
DRIVER_INITIALIZE __cdecl _CRT_DriverEntry;
DRIVER_UNLOAD __cdecl _CRT_DriverUnload;
@@ -255,14 +255,14 @@ void __cdecl KCRT_OnDriverUnload(void)
__dtors();
}
-void __cdecl _CRT_DriverUnload(_In_ struct _DRIVER_OBJECT * DriverObject)
+void __cdecl _CRT_DriverUnload(struct _DRIVER_OBJECT * DriverObject)
{
DriverUnload(DriverObject);
KCRT_OnDriverUnload();
}
-NTSTATUS __cdecl _CRT_DriverEntry(_In_ struct _DRIVER_OBJECT * DriverObject, _In_ PUNICODE_STRING RegistryPath)
+NTSTATUS __cdecl _CRT_DriverEntry(struct _DRIVER_OBJECT * DriverObject, PUNICODE_STRING RegistryPath)
{
NTSTATUS retval;
diff --git a/README.md b/README.md
index 29b0b47..c476afb 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
![Gitlab-CI](https://gitlab.com/lnslbrty/mingw-w64-ddk-template/badges/master/pipeline.svg "Gitlab-CI: master branch")
+![Circle-CI](https://circleci.com/gh/lnslbrty/mingw-w64-ddk-template.svg?style=shield "Circle-CI")
# Mingw64 Driver Plus Plus
diff --git a/ddk-template-cplusplus-EASTL.cpp b/ddk-template-cplusplus-EASTL.cpp
index d3cb0e3..18123bf 100644
--- a/ddk-template-cplusplus-EASTL.cpp
+++ b/ddk-template-cplusplus-EASTL.cpp
@@ -100,7 +100,7 @@ extern "C"
DRIVER_INITIALIZE DriverEntry;
DRIVER_UNLOAD DriverUnload;
- NTSTATUS DriverEntry(_In_ struct _DRIVER_OBJECT * DriverObject, _In_ PUNICODE_STRING RegistryPath)
+ NTSTATUS DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
{
(void)DriverObject;
(void)RegistryPath;
@@ -113,7 +113,7 @@ extern "C"
return STATUS_SUCCESS;
}
- VOID DriverUnload(_In_ struct _DRIVER_OBJECT * DriverObject)
+ VOID DriverUnload(PDRIVER_OBJECT DriverObject)
{
(void)DriverObject;
diff --git a/ddk-template-cplusplus.cpp b/ddk-template-cplusplus.cpp
index f9167ec..c1d9b29 100644
--- a/ddk-template-cplusplus.cpp
+++ b/ddk-template-cplusplus.cpp
@@ -103,7 +103,7 @@ extern "C"
DRIVER_INITIALIZE DriverEntry;
DRIVER_UNLOAD DriverUnload;
- NTSTATUS DriverEntry(_In_ struct _DRIVER_OBJECT * DriverObject, _In_ PUNICODE_STRING RegistryPath)
+ NTSTATUS DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
{
(void)DriverObject;
(void)RegistryPath;
@@ -116,7 +116,7 @@ extern "C"
return STATUS_SUCCESS;
}
- VOID DriverUnload(_In_ struct _DRIVER_OBJECT * DriverObject)
+ VOID DriverUnload(PDRIVER_OBJECT DriverObject)
{
(void)DriverObject;
diff --git a/ddk-template.c b/ddk-template.c
index 2d7becd..8a14af9 100644
--- a/ddk-template.c
+++ b/ddk-template.c
@@ -3,10 +3,7 @@
DRIVER_INITIALIZE DriverEntry;
DRIVER_UNLOAD DriverUnload;
-NTSTATUS DriverEntry(
- _In_ struct _DRIVER_OBJECT *DriverObject,
- _In_ PUNICODE_STRING RegistryPath
-)
+NTSTATUS DriverEntry(struct _DRIVER_OBJECT * DriverObject, PUNICODE_STRING RegistryPath)
{
(void)DriverObject;
(void)RegistryPath;
@@ -16,10 +13,7 @@ NTSTATUS DriverEntry(
return STATUS_SUCCESS;
}
-VOID
-DriverUnload(
- _In_ struct _DRIVER_OBJECT *DriverObject
-)
+VOID DriverUnload(struct _DRIVER_OBJECT * DriverObject)
{
(void)DriverObject;