diff --git a/.gitignore b/.gitignore index 1bbddc61..2fc64dc7 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ idd/Debug idd/x64 idd/LGIdd/x64 idd/LGIdd/Debug +idd/LGIdd/VersionInfo.h +idd/packages diff --git a/.woodpecker/idd.yaml b/.woodpecker/idd.yaml index 44192d87..b0b631b3 100644 --- a/.woodpecker/idd.yaml +++ b/.woodpecker/idd.yaml @@ -26,5 +26,5 @@ steps: - /C - > %VS_PATH%\BuildTools\Common7\Tools\VsDevCmd.bat -arch=amd64 && - msbuild idd\LGIdd.sln /p:Configuration=${BUILD_TYPE} /p:Platform=x64 /p:SignMode=Off /m && + msbuild /restore idd\LGIdd.sln /p:Configuration=${BUILD_TYPE} /p:Platform=x64 /p:SignMode=Off /m && IF EXIST C:\artifacts\build.cmd (cmd /C C:\artifacts\build.cmd) diff --git a/idd/LGIdd/CIndirectDeviceContext.cpp b/idd/LGIdd/CIndirectDeviceContext.cpp index 886c1fe9..0e14e492 100644 --- a/idd/LGIdd/CIndirectDeviceContext.cpp +++ b/idd/LGIdd/CIndirectDeviceContext.cpp @@ -23,6 +23,7 @@ #include "CPlatformInfo.h" #include "CDebug.h" +#include "VersionInfo.h" #include @@ -62,7 +63,7 @@ void CIndirectDeviceContext::InitAdapter() caps.EndPointDiagnostics.GammaSupport = IDDCX_FEATURE_IMPLEMENTATION_NONE; caps.EndPointDiagnostics.TransmissionType = IDDCX_TRANSMISSION_TYPE_OTHER; - caps.EndPointDiagnostics.pEndPointFriendlyName = L"Looking Glass IDD Device"; + caps.EndPointDiagnostics.pEndPointFriendlyName = L"Looking Glass IDD Driver"; caps.EndPointDiagnostics.pEndPointManufacturerName = L"Looking Glass"; caps.EndPointDiagnostics.pEndPointModelName = L"Looking Glass"; @@ -188,7 +189,7 @@ bool CIndirectDeviceContext::SetupLGMP(size_t alignSize) memcpy_s(kvmfr.magic, sizeof(kvmfr.magic), KVMFR_MAGIC, sizeof(KVMFR_MAGIC) - 1); kvmfr.version = KVMFR_VERSION; kvmfr.features = KVMFR_FEATURE_SETCURSORPOS; - strncpy_s(kvmfr.hostver, "FIXME-IDD", sizeof(kvmfr.hostver) - 1); + strncpy_s(kvmfr.hostver, LG_VERSION_STR, sizeof(kvmfr.hostver) - 1); ss.write(reinterpret_cast(&kvmfr), sizeof(kvmfr)); } @@ -207,7 +208,7 @@ bool CIndirectDeviceContext::SetupLGMP(size_t alignSize) const uint8_t * uuid = CPlatformInfo::GetUUID(); memcpy_s (vmInfo->uuid, sizeof(vmInfo->uuid), uuid, 16); - strncpy_s(vmInfo->capture, "Idd Driver", sizeof(vmInfo->capture)); + strncpy_s(vmInfo->capture, "Looking Glass IDD Driver", sizeof(vmInfo->capture)); KVMFRRecord * record = static_cast(calloc(1, sizeof(*record))); if (!record) diff --git a/idd/LGIdd/Driver.cpp b/idd/LGIdd/Driver.cpp index bcdc8188..5f621c1e 100644 --- a/idd/LGIdd/Driver.cpp +++ b/idd/LGIdd/Driver.cpp @@ -21,10 +21,14 @@ #include "driver.h" #include "driver.tmh" +#include "CDebug.h" #include "CPlatformInfo.h" +#include "VersionInfo.h" NTSTATUS DriverEntry(_In_ PDRIVER_OBJECT DriverObject, _In_ PUNICODE_STRING RegistryPath) { + DEBUG_INFO("Looking Glass IDD Driver (" LG_VERSION_STR ")"); + WDF_DRIVER_CONFIG config; NTSTATUS status; WDF_OBJECT_ATTRIBUTES attributes; diff --git a/idd/LGIdd/LGIdd.vcxproj b/idd/LGIdd/LGIdd.vcxproj index dfea3b3c..e1437f81 100644 --- a/idd/LGIdd/LGIdd.vcxproj +++ b/idd/LGIdd/LGIdd.vcxproj @@ -1,5 +1,6 @@  + Debug @@ -36,6 +37,7 @@ + @@ -327,6 +329,30 @@ - - + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + + + + + + + + + $([System.DateTime]::Now.ToString("yyyy")) + + GenerateVersionInfo; + $(BuildDependsOn); + + \ No newline at end of file diff --git a/idd/LGIdd/LGIdd.vcxproj.filters b/idd/LGIdd/LGIdd.vcxproj.filters index 829f699f..f47d95cf 100644 --- a/idd/LGIdd/LGIdd.vcxproj.filters +++ b/idd/LGIdd/LGIdd.vcxproj.filters @@ -20,6 +20,7 @@ +