From ec13fc161d12657288570b5d95694387fe485b45 Mon Sep 17 00:00:00 2001 From: Geoffrey McRae Date: Mon, 4 Dec 2017 02:31:16 +1100 Subject: [PATCH] [host] rename project to "Looking Glass" --- host/Capture/DXGI.cpp | 2 +- host/Capture/DXGI.h | 2 +- host/Capture/NvFBC.cpp | 2 +- host/Capture/NvFBC.h | 2 +- host/CaptureFactory.h | 2 +- host/CrashHandler.cpp | 4 ++-- host/CrashHandler.h | 2 +- host/ICapture.h | 4 ++-- host/IVSHMEM.cpp | 2 +- host/IVSHMEM.h | 2 +- ...{kvm-ivshmem-host.sln => Looking Glass.sln} | 2 +- host/Service.cpp | 18 +++++++++--------- host/Service.h | 4 ++-- host/Util.h | 2 +- ...host.vcxproj => looking-glass-host.vcxproj} | 1 + ...ters => looking-glass-host.vcxproj.filters} | 0 host/main.cpp | 4 ++-- 17 files changed, 28 insertions(+), 27 deletions(-) rename host/{kvm-ivshmem-host.sln => Looking Glass.sln} (88%) rename host/{kvm-ivshmem-host.vcxproj => looking-glass-host.vcxproj} (99%) rename host/{kvm-ivshmem-host.vcxproj.filters => looking-glass-host.vcxproj.filters} (100%) diff --git a/host/Capture/DXGI.cpp b/host/Capture/DXGI.cpp index be8ae456..03c95613 100644 --- a/host/Capture/DXGI.cpp +++ b/host/Capture/DXGI.cpp @@ -1,5 +1,5 @@ /* -KVMGFX Client - A KVM Client for VGA Passthrough +Looking Glass - KVM FrameRelay (KVMFR) Client Copyright (C) 2017 Geoffrey McRae This program is free software; you can redistribute it and/or modify it under diff --git a/host/Capture/DXGI.h b/host/Capture/DXGI.h index d44e64df..028148d0 100644 --- a/host/Capture/DXGI.h +++ b/host/Capture/DXGI.h @@ -1,5 +1,5 @@ /* -KVMGFX Client - A KVM Client for VGA Passthrough +Looking Glass - KVM FrameRelay (KVMFR) Client Copyright (C) 2017 Geoffrey McRae This program is free software; you can redistribute it and/or modify it under diff --git a/host/Capture/NvFBC.cpp b/host/Capture/NvFBC.cpp index bbb6c04a..560d4c64 100644 --- a/host/Capture/NvFBC.cpp +++ b/host/Capture/NvFBC.cpp @@ -1,5 +1,5 @@ /* -KVMGFX Client - A KVM Client for VGA Passthrough +Looking Glass - KVM FrameRelay (KVMFR) Client Copyright (C) 2017 Geoffrey McRae This program is free software; you can redistribute it and/or modify it under diff --git a/host/Capture/NvFBC.h b/host/Capture/NvFBC.h index 2425533a..ac0a085b 100644 --- a/host/Capture/NvFBC.h +++ b/host/Capture/NvFBC.h @@ -1,5 +1,5 @@ /* -KVMGFX Client - A KVM Client for VGA Passthrough +Looking Glass - KVM FrameRelay (KVMFR) Client Copyright (C) 2017 Geoffrey McRae This program is free software; you can redistribute it and/or modify it under diff --git a/host/CaptureFactory.h b/host/CaptureFactory.h index 91fe5319..f421811a 100644 --- a/host/CaptureFactory.h +++ b/host/CaptureFactory.h @@ -1,5 +1,5 @@ /* -KVMGFX Client - A KVM Client for VGA Passthrough +Looking Glass - KVM FrameRelay (KVMFR) Client Copyright (C) 2017 Geoffrey McRae This program is free software; you can redistribute it and/or modify it under diff --git a/host/CrashHandler.cpp b/host/CrashHandler.cpp index 4ba819c2..1b79821c 100644 --- a/host/CrashHandler.cpp +++ b/host/CrashHandler.cpp @@ -1,5 +1,5 @@ /* -KVMGFX Client - A KVM Client for VGA Passthrough +Looking Glass - KVM FrameRelay (KVMFR) Client Copyright (C) 2017 Geoffrey McRae This program is free software; you can redistribute it and/or modify it under @@ -47,7 +47,7 @@ LONG WINAPI CrashHandler::ExceptionFilter(struct _EXCEPTION_POINTERS * apExcepti return EXCEPTION_CONTINUE_SEARCH; HANDLE hFile = CreateFileA( - "kvm-ivshmem-host.dump", + "looking-glass-host.dump", GENERIC_WRITE, FILE_SHARE_WRITE, NULL, diff --git a/host/CrashHandler.h b/host/CrashHandler.h index eb984ce1..a89b4578 100644 --- a/host/CrashHandler.h +++ b/host/CrashHandler.h @@ -1,5 +1,5 @@ /* -KVMGFX Client - A KVM Client for VGA Passthrough +Looking Glass - KVM FrameRelay (KVMFR) Client Copyright (C) 2017 Geoffrey McRae This program is free software; you can redistribute it and/or modify it under diff --git a/host/ICapture.h b/host/ICapture.h index e8f706f1..8659c295 100644 --- a/host/ICapture.h +++ b/host/ICapture.h @@ -1,5 +1,5 @@ /* -KVMGFX Client - A KVM Client for VGA Passthrough +Looking Glass - KVM FrameRelay (KVMFR) Client Copyright (C) 2017 Geoffrey McRae This program is free software; you can redistribute it and/or modify it under @@ -18,7 +18,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA #pragma once -#include "common/KVMGFXHeader.h" +#include "common/KVMFR.h" #include struct FrameInfo diff --git a/host/IVSHMEM.cpp b/host/IVSHMEM.cpp index 0611d1b6..f687f38e 100644 --- a/host/IVSHMEM.cpp +++ b/host/IVSHMEM.cpp @@ -1,5 +1,5 @@ /* -KVMGFX Client - A KVM Client for VGA Passthrough +Looking Glass - KVM FrameRelay (KVMFR) Client Copyright (C) 2017 Geoffrey McRae This program is free software; you can redistribute it and/or modify it under diff --git a/host/IVSHMEM.h b/host/IVSHMEM.h index 65248534..ad608195 100644 --- a/host/IVSHMEM.h +++ b/host/IVSHMEM.h @@ -1,5 +1,5 @@ /* -KVMGFX Client - A KVM Client for VGA Passthrough +Looking Glass - KVM FrameRelay (KVMFR) Client Copyright (C) 2017 Geoffrey McRae This program is free software; you can redistribute it and/or modify it under diff --git a/host/kvm-ivshmem-host.sln b/host/Looking Glass.sln similarity index 88% rename from host/kvm-ivshmem-host.sln rename to host/Looking Glass.sln index 9d2baf5c..d80e69ba 100644 --- a/host/kvm-ivshmem-host.sln +++ b/host/Looking Glass.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kvm-ivshmem-host", "kvm-ivshmem-host.vcxproj", "{D439DE3E-32FB-4599-8B5D-C92674D400D4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "looking-glass-host", "looking-glass-host.vcxproj", "{D439DE3E-32FB-4599-8B5D-C92674D400D4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/host/Service.cpp b/host/Service.cpp index f44db8d0..2608f3cb 100644 --- a/host/Service.cpp +++ b/host/Service.cpp @@ -1,5 +1,5 @@ /* -KVMGFX Client - A KVM Client for VGA Passthrough +Looking Glass - KVM FrameRelay (KVMFR) Client Copyright (C) 2017 Geoffrey McRae This program is free software; you can redistribute it and/or modify it under @@ -20,7 +20,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA #include "IVSHMEM.h" #include "common\debug.h" -#include "common\KVMGFXHeader.h" +#include "common\KVMFR.h" #include "CaptureFactory.h" @@ -53,9 +53,9 @@ bool Service::Initialize(ICapture * captureDevice) return false; } - if (m_ivshmem->GetSize() < sizeof(KVMGFXHeader)) + if (m_ivshmem->GetSize() < sizeof(KVMFRHeader)) { - DEBUG_ERROR("Shared memory is not large enough for the KVMGFXHeader"); + DEBUG_ERROR("Shared memory is not large enough for the KVMFRHeader"); DeInitialize(); return false; } @@ -76,8 +76,8 @@ bool Service::Initialize(ICapture * captureDevice) return false; } - m_header = reinterpret_cast(memory); - m_frame[0] = (uint8_t *)(((uintptr_t)memory + sizeof(KVMGFXHeader *) + 0x7F) & ~0x7F); + m_header = reinterpret_cast(memory); + m_frame[0] = (uint8_t *)(((uintptr_t)memory + sizeof(KVMFRHeader *) + 0x7F) & ~0x7F); m_frameSize = ((m_ivshmem->GetSize() - (m_frame[0] - memory)) & ~0x7F) >> 1; m_frame[1] = m_frame[0] + m_frameSize; m_dataOffset[0] = m_frame[0] - memory; @@ -93,10 +93,10 @@ bool Service::Initialize(ICapture * captureDevice) // we save this as it might actually be valid UINT16 hostID = m_header->hostID; - ZeroMemory(m_header, sizeof(KVMGFXHeader)); - memcpy(m_header->magic, KVMGFX_HEADER_MAGIC, sizeof(KVMGFX_HEADER_MAGIC)); + ZeroMemory(m_header, sizeof(KVMFRHeader)); + memcpy(m_header->magic, KVMFR_HEADER_MAGIC, sizeof(KVMFR_HEADER_MAGIC)); - m_header->version = KVMGFX_HEADER_VERSION; + m_header->version = KVMFR_HEADER_VERSION; m_header->guestID = m_ivshmem->GetPeerID(); m_header->hostID = hostID; m_header->frameType = m_capture->GetFrameType(); diff --git a/host/Service.h b/host/Service.h index 8362d35a..e6a73563 100644 --- a/host/Service.h +++ b/host/Service.h @@ -1,5 +1,5 @@ /* -KVMGFX Client - A KVM Client for VGA Passthrough +Looking Glass - KVM FrameRelay (KVMFR) Client Copyright (C) 2017 Geoffrey McRae This program is free software; you can redistribute it and/or modify it under @@ -50,7 +50,7 @@ private: HANDLE m_readyEvent; ICapture * m_capture; - KVMGFXHeader * m_header; + KVMFRHeader * m_header; uint8_t * m_frame[2]; size_t m_frameSize; uint64_t m_dataOffset[2]; diff --git a/host/Util.h b/host/Util.h index 71f5e9b1..d9938800 100644 --- a/host/Util.h +++ b/host/Util.h @@ -1,5 +1,5 @@ /* -KVMGFX Client - A KVM Client for VGA Passthrough +Looking Glass - KVM FrameRelay (KVMFR) Client Copyright (C) 2017 Geoffrey McRae This program is free software; you can redistribute it and/or modify it under diff --git a/host/kvm-ivshmem-host.vcxproj b/host/looking-glass-host.vcxproj similarity index 99% rename from host/kvm-ivshmem-host.vcxproj rename to host/looking-glass-host.vcxproj index 61403a50..f54c2876 100644 --- a/host/kvm-ivshmem-host.vcxproj +++ b/host/looking-glass-host.vcxproj @@ -23,6 +23,7 @@ Win32Proj kvmivshmemhost 8.1 + looking-glass-host diff --git a/host/kvm-ivshmem-host.vcxproj.filters b/host/looking-glass-host.vcxproj.filters similarity index 100% rename from host/kvm-ivshmem-host.vcxproj.filters rename to host/looking-glass-host.vcxproj.filters diff --git a/host/main.cpp b/host/main.cpp index b24d47c4..84b69580 100644 --- a/host/main.cpp +++ b/host/main.cpp @@ -1,5 +1,5 @@ /* -KVMGFX Client - A KVM Client for VGA Passthrough +Looking Glass - KVM FrameRelay (KVMFR) Client Copyright (C) 2017 Geoffrey McRae This program is free software; you can redistribute it and/or modify it under @@ -202,7 +202,7 @@ void doLicense() { setupConsole(); fprintf(stderr, - "KVMGFX Client - A KVM Client for VGA Passthrough\n" + "Looking Glass - KVM FrameRelay (KVMFR) Client\n" "Copyright(C) 2017 Geoffrey McRae \n" "\n" "This program is free software; you can redistribute it and / or modify it under\n"