diff options
| author | Pierre Ossman <ossman@cendio.se> | 2024-11-22 13:23:03 +0100 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2024-11-22 13:23:03 +0100 |
| commit | 9366d8e54c5ee1c2cfcf333a17b7fd4bdbd13993 (patch) | |
| tree | 3fd8306bb874e1198a49f9a9ee9a7f417d10da92 | |
| parent | cd52658ff6e73aa1c36f01a8486ba346a869c848 (diff) | |
| parent | 0af41e7fed978f934f3dc6ca8c99599a212467c5 (diff) | |
| download | tigervnc-9366d8e54c5ee1c2cfcf333a17b7fd4bdbd13993.tar.gz tigervnc-9366d8e54c5ee1c2cfcf333a17b7fd4bdbd13993.zip | |
Merge branch 'master' of https://github.com/madnicendio/tigervnc
90 files changed, 380 insertions, 380 deletions
diff --git a/BUILDING.txt b/BUILDING.txt index 8067bd90..7e73d72e 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -4,7 +4,7 @@ ================================ -Build Requirements (All Systems) +Build requirements (all systems) ================================ -- CMake (http://www.cmake.org) v3.10 or later @@ -36,7 +36,7 @@ Development kits for the following packages: ========================= -Build Requirements (Unix) +Build requirements (Unix) ========================= -- Non-Mac platforms: @@ -59,7 +59,7 @@ Build Requirements (Unix) * libpwquality ============================ -Build Requirements (Windows) +Build requirements (Windows) ============================ -- MinGW or MinGW-w64 @@ -75,16 +75,16 @@ Build Requirements (Windows) ========================= -Build Requirements (Java) +Build requirements (Java) ========================= -- Sun/Oracle JDK 1.7 or later or OpenJDK 7 or later --- See "Building Java Support" below. +-- See "Building Java support" below. ================== -Out-of-Tree Builds +Out-of-tree builds ================== Binary objects, libraries, and executables are generated in the same directory @@ -102,10 +102,10 @@ Building TigerVNC ================= -Building the TigerVNC Viewer on Unix/Mac Systems +Building the TigerVNC viewer on Unix/Mac systems ------------------------------------------------ -The following procedure will build the TigerVNC Viewer on Linux and Unix +The following procedure will build the TigerVNC viewer on Linux and Unix systems. cd {build_directory} @@ -113,10 +113,10 @@ systems. make -Building the TigerVNC Server on Unix/Linux Systems +Building the TigerVNC server on Unix/Linux systems -------------------------------------------------- -Building the TigerVNC Server (Xvnc) is a bit trickier. Xvnc is typically built +Building the TigerVNC server (Xvnc) is a bit trickier. Xvnc is typically built to use the X11 shared libraries provided with the system. The procedure for this is system-specific, since it requires specifying such things as font directories, but the general outline is as follows (this procedure assumes @@ -162,7 +162,7 @@ that the viewer has already been built, per above.) (NOTE: Use absolute paths for source_directory and build_directory) -Building the Windows TigerVNC Viewer with MinGW +Building the Windows TigerVNC viewer with MinGW ----------------------------------------------- If building the Windows version of TigerVNC on a Windows build system, use @@ -176,13 +176,13 @@ If cross-compiling on a Unix/Linux system, then see the "Build Recipes" section below. -Debug Build +Debug build ----------- Add "-DCMAKE_BUILD_TYPE=Debug" to the CMake command line. -Portable (semi-static) Build +Portable (semi-static) build ---------------------------- TigerVNC can under favourble circumstances be built in a way that allows @@ -199,7 +199,7 @@ specific system. ===================== -Building Java Support +Building Java support ===================== TigerVNC includes a Java version of the TigerVNC Viewer, which can be used on @@ -221,10 +221,10 @@ tools are needed to sign the JAR file, which is necessary to enable certain functionality (such as clipboard transfers) when the Java viewer is used as an applet. -If the Java viewer is built along with the Windows TigerVNC Server (WinVNC), +If the Java viewer is built along with the Windows TigerVNC server (WinVNC), then the build system will embed the Java viewer into WinVNC4.exe so that it will automatically be served up using WinVNC's built-in HTTP server. -Similarly, if the Java viewer is built along with the Unix TigerVNC Server +Similarly, if the Java viewer is built along with the Unix TigerVNC server (Xvnc), then the build system will include the Java viewer in the server tarball. @@ -252,7 +252,7 @@ or ":file " (see the jarsigner documentation for more info): ====================================== -Building TLS Support +Building TLS support ====================================== TLS requires GnuTLS, which is supplied with most Linux distributions and @@ -272,7 +272,7 @@ libgnutls located under /usr/local. ====================================== -Building Native Language Support (NLS) +Building native language support (NLS) ====================================== NLS requires gettext, which is supplied with most Linux distributions and @@ -314,7 +314,7 @@ c:\Program Files\TigerVNC on Windows and /usr/local on Unix. ========================= -Creating Release Packages +Creating release packages ========================= The following commands can be used to create various types of release packages: @@ -325,16 +325,16 @@ Unix make tarball - Create a binary tarball containing the TigerVNC Viewer + Create a binary tarball containing the TigerVNC viewer make servertarball - Create a binary tarball containing both the TigerVNC Server and Viewer + Create a binary tarball containing both the TigerVNC server and viewer make dmg Create Macintosh disk image file that contains an application bundle of the - TigerVNC Viewer + TigerVNC viewer Windows @@ -347,11 +347,11 @@ make installer ============= -Build Recipes +Build recipes ============= -MinGW Build on Cygwin +MinGW build on Cygwin --------------------- cd {build_directory} @@ -367,7 +367,7 @@ other Cygwin DLL's. The mingw64-x86_64-gcc-core and mingw64-x86_64-gcc-g++ packages (and their dependencies) must be installed. -MinGW-w64 Build on Windows +MinGW-w64 build on Windows -------------------------- This produces a build of TigerVNC using the "native" MinGW-w64 toolchain @@ -384,7 +384,7 @@ This produces a build of TigerVNC using the "native" MinGW-w64 toolchain make -MinGW Build on Linux +MinGW build on Linux -------------------- cd {build_directory} @@ -399,7 +399,7 @@ MinGW Build on Linux =============================== -Distribution-Specific Packaging +Distribution-specific packaging =============================== Configuration for building packages for current versions of RHEL/CentOS diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d566f1e..5b91d84e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -244,7 +244,7 @@ set(CMAKE_REQUIRED_FLAGS) set(CMAKE_REQUIRED_DEFINITIONS) if(NOT FOUND_LIBJPEG_TURBO) - message(STATUS "WARNING: You are not using libjpeg-turbo. Performance will suffer.") + message(STATUS "Warning: You are not using libjpeg-turbo. Performance will suffer.") endif() option(BUILD_JAVA "Build Java version of the TigerVNC Viewer" FALSE) @@ -56,26 +56,26 @@ All versions of TigerVNC contain the following programs: VNC server can be running on a Windows or a Unix/Linux machine. -Windows-Specific +Windows-specific ================ The Windows version of TigerVNC contains the following programs: -* winvnc - the TigerVNC Server for Windows. winvnc allows a Windows desktop to +* winvnc - the TigerVNC server for Windows. winvnc allows a Windows desktop to be accessed remotely using a VNC viewer. WARNING: winvnc is currently unmaintained and and may not function correctly. -winvnc may not work if the Fast User Switching or Remote Desktop features are +winvnc may not work if the Fast user switching or Remote desktop features are in use. -Unix/Linux-Specific (not Mac) +Unix/Linux-specific (not Mac) ============================= The Unix/Linux version of TigerVNC contains the following programs: -* Xvnc - the TigerVNC Server for Unix. Xvnc is both a VNC server and an X +* Xvnc - the TigerVNC server for Unix. Xvnc is both a VNC server and an X server with a "virtual" framebuffer. You should normally use the vncserver service to start Xvnc. diff --git a/common/network/TcpSocket.cxx b/common/network/TcpSocket.cxx index bf603755..e37861f4 100644 --- a/common/network/TcpSocket.cxx +++ b/common/network/TcpSocket.cxx @@ -220,7 +220,7 @@ const char* TcpSocket::getPeerAddress() { socklen_t sa_size = sizeof(sa); if (getpeername(getFd(), &sa.u.sa, &sa_size) != 0) { - vlog.error("unable to get peer name for socket"); + vlog.error("Unable to get peer name for socket"); return "(N/A)"; } @@ -234,7 +234,7 @@ const char* TcpSocket::getPeerAddress() { buffer + 1, sizeof(buffer) - 2, nullptr, 0, NI_NUMERICHOST); if (ret != 0) { - vlog.error("unable to convert peer name to a string"); + vlog.error("Unable to convert peer name to a string"); return "(N/A)"; } @@ -248,14 +248,14 @@ const char* TcpSocket::getPeerAddress() { name = inet_ntoa(sa.u.sin.sin_addr); if (name == nullptr) { - vlog.error("unable to convert peer name to a string"); + vlog.error("Unable to convert peer name to a string"); return "(N/A)"; } return name; } - vlog.error("unknown address family for socket"); + vlog.error("Unknown address family for socket"); return ""; } @@ -284,7 +284,7 @@ bool TcpSocket::enableNagles(bool enable) { if (setsockopt(getFd(), IPPROTO_TCP, TCP_NODELAY, (char *)&one, sizeof(one)) < 0) { int e = errorNumber; - vlog.error("unable to setsockopt TCP_NODELAY: %d", e); + vlog.error("Unable to setsockopt TCP_NODELAY: %d", e); return false; } return true; @@ -302,7 +302,7 @@ TcpListener::TcpListener(const struct sockaddr *listenaddr, int sock; if ((sock = socket (listenaddr->sa_family, SOCK_STREAM, 0)) < 0) - throw socket_error("unable to create listening socket", errorNumber); + throw socket_error("Unable to create listening socket", errorNumber); memcpy (&sa, listenaddr, listenaddrlen); #ifdef IPV6_V6ONLY @@ -310,7 +310,7 @@ TcpListener::TcpListener(const struct sockaddr *listenaddr, if (setsockopt (sock, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&one, sizeof(one))) { int e = errorNumber; closesocket(sock); - throw socket_error("unable to set IPV6_V6ONLY", e); + throw socket_error("Unable to set IPV6_V6ONLY", e); } } #endif /* defined(IPV6_V6ONLY) */ @@ -328,14 +328,14 @@ TcpListener::TcpListener(const struct sockaddr *listenaddr, (char *)&one, sizeof(one)) < 0) { int e = errorNumber; closesocket(sock); - throw socket_error("unable to create listening socket", e); + throw socket_error("Unable to create listening socket", e); } #endif if (bind(sock, &sa.u.sa, listenaddrlen) == -1) { int e = errorNumber; closesocket(sock); - throw socket_error("failed to bind socket", e); + throw socket_error("Failed to bind socket", e); } listen(sock); @@ -446,7 +446,7 @@ void network::createTcpListeners(std::list<SocketListener*> *listeners, snprintf (service, sizeof (service) - 1, "%d", port); service[sizeof (service) - 1] = '\0'; if ((result = getaddrinfo(addr, service, &hints, &ai)) != 0) - throw getaddrinfo_error("unable to resolve listening address", result); + throw getaddrinfo_error("Unable to resolve listening address", result); try { createTcpListeners(listeners, ai); @@ -633,7 +633,7 @@ TcpFilter::Pattern TcpFilter::parsePattern(const char* p) { } if ((result = getaddrinfo (parts[0].c_str(), nullptr, &hints, &ai)) != 0) { - throw getaddrinfo_error("unable to resolve host by name", result); + throw getaddrinfo_error("Unable to resolve host by name", result); } memcpy (&pattern.address.u.sa, ai->ai_addr, ai->ai_addrlen); @@ -644,7 +644,7 @@ TcpFilter::Pattern TcpFilter::parsePattern(const char* p) { if (parts.size() > 1) { if (family == AF_INET && (parts[1].find('.') != std::string::npos)) { - throw std::invalid_argument("mask no longer supported for " + throw std::invalid_argument("Mask no longer supported for " "filter, use prefix instead"); } diff --git a/common/network/UnixSocket.cxx b/common/network/UnixSocket.cxx index c8517300..fb017a53 100644 --- a/common/network/UnixSocket.cxx +++ b/common/network/UnixSocket.cxx @@ -72,7 +72,7 @@ UnixSocket::UnixSocket(const char *path) } if (result == -1) - throw socket_error("unable to connect to socket", err); + throw socket_error("Unable to connect to socket", err); setFd(sock); } @@ -87,7 +87,7 @@ const char* UnixSocket::getPeerAddress() { salen = sizeof(addr); if (getpeername(getFd(), (struct sockaddr *)&addr, &salen) != 0) { - vlog.error("unable to get peer name for socket"); + vlog.error("Unable to get peer name for socket"); return ""; } @@ -96,7 +96,7 @@ const char* UnixSocket::getPeerAddress() { salen = sizeof(addr); if (getsockname(getFd(), (struct sockaddr *)&addr, &salen) != 0) { - vlog.error("unable to get local name for socket"); + vlog.error("Unable to get local name for socket"); return ""; } @@ -123,7 +123,7 @@ UnixListener::UnixListener(const char *path, int mode) // - Create a socket if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) - throw socket_error("unable to create listening socket", errno); + throw socket_error("Unable to create listening socket", errno); // - Delete existing socket (ignore result) unlink(path); @@ -138,14 +138,14 @@ UnixListener::UnixListener(const char *path, int mode) umask(saved_umask); if (result < 0) { close(fd); - throw socket_error("unable to bind listening socket", err); + throw socket_error("Unable to bind listening socket", err); } // - Set socket mode if (chmod(path, mode) < 0) { err = errno; close(fd); - throw socket_error("unable to set socket mode", err); + throw socket_error("Unable to set socket mode", err); } listen(fd); diff --git a/common/rdr/RandomStream.cxx b/common/rdr/RandomStream.cxx index 485259cf..3a524102 100644 --- a/common/rdr/RandomStream.cxx +++ b/common/rdr/RandomStream.cxx @@ -50,11 +50,11 @@ RandomStream::RandomStream() if (GetLastError() == (DWORD)NTE_BAD_KEYSET) { if (!CryptAcquireContext(&provider, nullptr, nullptr, PROV_RSA_FULL, CRYPT_NEWKEYSET)) { - vlog.error("unable to create keyset"); + vlog.error("Unable to create keyset"); provider = 0; } } else { - vlog.error("unable to acquire context"); + vlog.error("Unable to acquire context"); provider = 0; } } @@ -69,7 +69,7 @@ RandomStream::RandomStream() { #endif #endif - vlog.error("no OS supplied random source - using rand()"); + vlog.error("No OS supplied random source, using rand()"); seed += (unsigned int) time(nullptr) + getpid() + getpid() * 987654 + rand(); srand(seed); } @@ -89,7 +89,7 @@ bool RandomStream::fillBuffer() { #ifdef RFB_HAVE_WINCRYPT if (provider) { if (!CryptGenRandom(provider, availSpace(), (uint8_t*)end)) - throw rdr::win32_error("unable to CryptGenRandom", GetLastError()); + throw rdr::win32_error("Unable to CryptGenRandom", GetLastError()); end += availSpace(); } else { #else @@ -97,7 +97,7 @@ bool RandomStream::fillBuffer() { if (fp) { size_t n = fread((uint8_t*)end, 1, availSpace(), fp); if (n <= 0) - throw rdr::posix_error("reading /dev/urandom or /dev/random " + throw rdr::posix_error("Reading /dev/urandom or /dev/random " "failed", errno); end += n; } else { diff --git a/common/rdr/ZlibOutStream.cxx b/common/rdr/ZlibOutStream.cxx index 13788f8d..5079c723 100644 --- a/common/rdr/ZlibOutStream.cxx +++ b/common/rdr/ZlibOutStream.cxx @@ -96,7 +96,7 @@ bool ZlibOutStream::flushBuffer() zs->avail_in = ptr - sentUpTo; #ifdef ZLIBOUT_DEBUG - vlog.debug("flush: avail_in %d",zs->avail_in); + vlog.debug("Flush: avail_in %d",zs->avail_in); #endif // Force out everything from the zlib encoder @@ -123,7 +123,7 @@ void ZlibOutStream::deflate(int flush) zs->avail_out = chunk = underlying->avail(); #ifdef ZLIBOUT_DEBUG - vlog.debug("calling deflate, avail_in %d, avail_out %d", + vlog.debug("Calling deflate, avail_in %d, avail_out %d", zs->avail_in,zs->avail_out); #endif @@ -137,7 +137,7 @@ void ZlibOutStream::deflate(int flush) } #ifdef ZLIBOUT_DEBUG - vlog.debug("after deflate: %d bytes", + vlog.debug("After deflate: %d bytes", zs->next_out-underlying->getptr()); #endif @@ -151,7 +151,7 @@ void ZlibOutStream::checkCompressionLevel() if (newLevel != compressionLevel) { #ifdef ZLIBOUT_DEBUG - vlog.debug("change: avail_in %d",zs->avail_in); + vlog.debug("Change: avail_in %d",zs->avail_in); #endif // zlib is just horribly stupid. It does an implicit flush on diff --git a/common/rfb/CConnection.cxx b/common/rfb/CConnection.cxx index c6feef9f..e8451337 100644 --- a/common/rfb/CConnection.cxx +++ b/common/rfb/CConnection.cxx @@ -161,7 +161,7 @@ bool CConnection::processVersionMsg() int majorVersion; int minorVersion; - vlog.debug("reading protocol version"); + vlog.debug("Reading protocol version"); if (!is->hasData(12)) return false; @@ -211,7 +211,7 @@ bool CConnection::processVersionMsg() bool CConnection::processSecurityTypesMsg() { - vlog.debug("processing security types message"); + vlog.debug("Processing security types message"); int secType = secTypeInvalid; @@ -296,7 +296,7 @@ bool CConnection::processSecurityTypesMsg() bool CConnection::processSecurityMsg() { - vlog.debug("processing security message"); + vlog.debug("Processing security message"); if (!csecurity->processMsg()) return false; @@ -307,7 +307,7 @@ bool CConnection::processSecurityMsg() bool CConnection::processSecurityResultMsg() { - vlog.debug("processing security result message"); + vlog.debug("Processing security result message"); int result; if (server.beforeVersion(3,8) && csecurity->getType() == secTypeNone) { @@ -323,10 +323,10 @@ bool CConnection::processSecurityResultMsg() securityCompleted(); return true; case secResultFailed: - vlog.debug("auth failed"); + vlog.debug("Auth failed"); break; case secResultTooMany: - vlog.debug("auth failed - too many tries"); + vlog.debug("Auth failed: Too many tries"); break; default: throw protocol_error("Unknown security result from server"); @@ -343,7 +343,7 @@ bool CConnection::processSecurityResultMsg() bool CConnection::processSecurityReasonMsg() { - vlog.debug("processing security reason message"); + vlog.debug("Processing security reason message"); if (!is->hasData(4)) return false; @@ -365,7 +365,7 @@ bool CConnection::processSecurityReasonMsg() bool CConnection::processInitMsg() { - vlog.debug("reading server initialisation"); + vlog.debug("Reading server initialisation"); return reader_->readServerInit(); } @@ -462,7 +462,7 @@ void CConnection::serverInit(int width, int height, CMsgHandler::serverInit(width, height, pf, name); state_ = RFBSTATE_NORMAL; - vlog.debug("initialisation done"); + vlog.debug("Initialisation done"); initDone(); assert(framebuffer != nullptr); diff --git a/common/rfb/CMsgReader.cxx b/common/rfb/CMsgReader.cxx index 9bad5036..a10f7c47 100644 --- a/common/rfb/CMsgReader.cxx +++ b/common/rfb/CMsgReader.cxx @@ -281,7 +281,7 @@ bool CMsgReader::readServerCutText() if (len > (size_t)maxCutText) { is->skip(len); - vlog.error("cut text too long (%d bytes) - ignoring",len); + vlog.error("Cut text too long (%d bytes) - ignoring",len); return true; } @@ -481,7 +481,7 @@ bool CMsgReader::readRect(const Rect& r, int encoding) } if (r.is_empty()) - vlog.error("zero size rect"); + vlog.error("Zero size rect"); return handler->dataRect(r, encoding); } diff --git a/common/rfb/CSecurityTLS.cxx b/common/rfb/CSecurityTLS.cxx index 3761ca30..9072ce50 100644 --- a/common/rfb/CSecurityTLS.cxx +++ b/common/rfb/CSecurityTLS.cxx @@ -316,7 +316,7 @@ void CSecurityTLS::checkSession() err = gnutls_certificate_verify_peers2(session, &status); if (err != 0) { - vlog.error("server certificate verification failed: %s", gnutls_strerror(err)); + vlog.error("Server certificate verification failed: %s", gnutls_strerror(err)); throw rdr::tls_error("server certificate verification()", err); } diff --git a/common/rfb/Configuration.cxx b/common/rfb/Configuration.cxx index 8f7cb6a7..44d42a88 100644 --- a/common/rfb/Configuration.cxx +++ b/common/rfb/Configuration.cxx @@ -237,7 +237,7 @@ bool VoidParameter::isBool() const { void VoidParameter::setImmutable() { - vlog.debug("set immutable %s", getName()); + vlog.debug("Set immutable %s", getName()); immutable = true; } @@ -271,7 +271,7 @@ bool AliasParameter::isBool() const { void AliasParameter::setImmutable() { - vlog.debug("set immutable %s (Alias)", getName()); + vlog.debug("Set immutable %s (Alias)", getName()); param->setImmutable(); } @@ -309,7 +309,7 @@ bool BoolParameter::setParam() { void BoolParameter::setParam(bool b) { if (immutable) return; value = b; - vlog.debug("set %s(Bool) to %d", getName(), value); + vlog.debug("Set %s(Bool) to %d", getName(), value); } std::string BoolParameter::getDefaultStr() const { @@ -346,7 +346,7 @@ IntParameter::setParam(const char* v) { bool IntParameter::setParam(int v) { if (immutable) return true; - vlog.debug("set %s(Int) to %d", getName(), v); + vlog.debug("Set %s(Int) to %d", getName(), v); if (v < minValue || v > maxValue) return false; value = v; @@ -389,7 +389,7 @@ bool StringParameter::setParam(const char* v) { if (immutable) return true; if (!v) throw std::invalid_argument("setParam(<null>) not allowed"); - vlog.debug("set %s(String) to %s", getName(), v); + vlog.debug("Set %s(String) to %s", getName(), v); value = v; return true; } @@ -440,7 +440,7 @@ bool BinaryParameter::setParam(const char* v) { void BinaryParameter::setParam(const uint8_t* v, size_t len) { LOCK_CONFIG; if (immutable) return; - vlog.debug("set %s(Binary)", getName()); + vlog.debug("Set %s(Binary)", getName()); delete [] value; value = nullptr; length = 0; diff --git a/common/rfb/KeyRemapper.cxx b/common/rfb/KeyRemapper.cxx index 328955d7..1c478178 100644 --- a/common/rfb/KeyRemapper.cxx +++ b/common/rfb/KeyRemapper.cxx @@ -60,12 +60,12 @@ void KeyRemapper::setMapping(const char* m) { if (sscanf(m, "0x%x%c>0x%x", &from, &bidi, &to) == 3) { if (bidi != '-' && bidi != '<') - vlog.error("warning: unknown operation %c>, assuming ->", bidi); + vlog.error("Warning: Unknown operation %c>, assuming ->", bidi); mapping[from] = to; if (bidi == '<') mapping[to] = from; } else { - vlog.error("warning: bad mapping %.*s", (int)(nextComma-m), m); + vlog.error("Warning: Bad mapping %.*s", (int)(nextComma-m), m); } m = nextComma; if (nextComma[0]) diff --git a/common/rfb/SConnection.cxx b/common/rfb/SConnection.cxx index a31249fb..dc0c1e85 100644 --- a/common/rfb/SConnection.cxx +++ b/common/rfb/SConnection.cxx @@ -112,7 +112,7 @@ bool SConnection::processVersionMsg() int majorVersion; int minorVersion; - vlog.debug("reading protocol version"); + vlog.debug("Reading protocol version"); if (!is->hasData(12)) return false; @@ -195,7 +195,7 @@ bool SConnection::processVersionMsg() bool SConnection::processSecurityTypeMsg() { - vlog.debug("processing security type message"); + vlog.debug("Processing security type message"); if (!is->hasData(1)) return false; @@ -230,7 +230,7 @@ void SConnection::processSecurityType(int secType) bool SConnection::processSecurityMsg() { - vlog.debug("processing security message"); + vlog.debug("Processing security message"); try { if (!ssecurity->processMsg()) return false; @@ -274,7 +274,7 @@ bool SConnection::processSecurityFailure() bool SConnection::processInitMsg() { - vlog.debug("reading client initialisation"); + vlog.debug("Reading client initialisation"); return reader_->readClientInit(); } diff --git a/common/rfb/SSecurityVncAuth.cxx b/common/rfb/SSecurityVncAuth.cxx index c4899aa9..22d88079 100644 --- a/common/rfb/SSecurityVncAuth.cxx +++ b/common/rfb/SSecurityVncAuth.cxx @@ -132,17 +132,17 @@ void VncAuthPasswdParameter::getVncAuthPasswd(std::string *password, std::string if (passwdFile) { const char *fname = *passwdFile; if (!fname[0]) { - vlog.info("neither %s nor %s params set", getName(), passwdFile->getName()); + vlog.info("Neither %s nor %s params set", getName(), passwdFile->getName()); return; } FILE* fp = fopen(fname, "r"); if (!fp) { - vlog.error("opening password file '%s' failed", fname); + vlog.error("Opening password file '%s' failed", fname); return; } - vlog.debug("reading password file"); + vlog.debug("Reading password file"); obfuscated.resize(8); obfuscated.resize(fread(obfuscated.data(), 1, 8, fp)); obfuscatedReadOnly.resize(8); diff --git a/common/rfb/TightEncoder.cxx b/common/rfb/TightEncoder.cxx index 169b74f7..3d46aaa3 100644 --- a/common/rfb/TightEncoder.cxx +++ b/common/rfb/TightEncoder.cxx @@ -43,7 +43,7 @@ struct TightConf { // settings for each of 10 compression levels (0..9). // // NOTE: The parameters used in this encoder are the result of painstaking -// research by The VirtualGL Project using RFB session captures from a variety +// research by The VirtualGL project using RFB session captures from a variety // of both 2D and 3D applications. See http://www.VirtualGL.org for the full // reports. diff --git a/common/rfb/TightJPEGEncoder.cxx b/common/rfb/TightJPEGEncoder.cxx index de8fd77f..527dc618 100644 --- a/common/rfb/TightJPEGEncoder.cxx +++ b/common/rfb/TightJPEGEncoder.cxx @@ -37,7 +37,7 @@ struct TightJPEGConfiguration { }; // NOTE: The JPEG quality and subsampling levels below were obtained -// experimentally by the VirtualGL Project. They represent the approximate +// experimentally by the VirtualGL project. They represent the approximate // average compression ratios listed below, as measured across the set of // every 10th frame in the SPECviewperf 9 benchmark suite. // diff --git a/common/rfb/Timer.cxx b/common/rfb/Timer.cxx index fbc9bae9..6f7ec7ba 100644 --- a/common/rfb/Timer.cxx +++ b/common/rfb/Timer.cxx @@ -99,7 +99,7 @@ int Timer::getNextTimeout() { return toWait; } // Time has jumped backwards! - vlog.info("time has moved backwards!"); + vlog.info("Time has moved backwards!"); pending.front()->dueTime = now; toWait = 0; } diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx index f40bd79e..cb36872a 100644 --- a/common/rfb/VNCSConnectionST.cxx +++ b/common/rfb/VNCSConnectionST.cxx @@ -82,7 +82,7 @@ VNCSConnectionST::~VNCSConnectionST() { // If we reach here then VNCServerST is deleting us! if (!closeReason.empty()) - vlog.info("closing %s: %s", peerEndpoint.c_str(), + vlog.info("Closing %s: %s", peerEndpoint.c_str(), closeReason.c_str()); // Release any keys the client still had pressed @@ -122,7 +122,7 @@ void VNCSConnectionST::close(const char* reason) if (closeReason.empty()) closeReason = reason; else - vlog.debug("second close: %s (%s)", peerEndpoint.c_str(), reason); + vlog.debug("Second close: %s (%s)", peerEndpoint.c_str(), reason); try { if (sock->outStream().hasBufferedData()) { diff --git a/common/rfb/VNCServerST.cxx b/common/rfb/VNCServerST.cxx index f175d31f..f4f48e1e 100644 --- a/common/rfb/VNCServerST.cxx +++ b/common/rfb/VNCServerST.cxx @@ -17,7 +17,7 @@ * USA. */ -// -=- Single-Threaded VNC Server implementation +// -=- Single-Threaded VNC server implementation // Note about how sockets get closed: diff --git a/java/cmake/SignJar.cmake b/java/cmake/SignJar.cmake index cfca1ba2..dc8f1f2a 100644 --- a/java/cmake/SignJar.cmake +++ b/java/cmake/SignJar.cmake @@ -31,7 +31,7 @@ else() execute_process(COMMAND ${KEYTOOL} -genkey -alias TigerVNC -keystore tigervnc.keystore -keyalg RSA -storepass tigervnc -keypass tigervnc -validity 7300 - -dname "CN=TigerVNC, OU=Software Development, O=The TigerVNC Project, L=Austin, S=Texas, C=US" + -dname "CN=TigerVNC, OU=Software development, O=The TigerVNC project, L=Austin, S=Texas, C=US" RESULT_VARIABLE RESULT OUTPUT_VARIABLE OUTPUT ERROR_VARIABLE ERROR) if(NOT RESULT EQUAL 0) message(FATAL_ERROR "${KEYTOOL} failed:\n${ERROR}") diff --git a/java/com/jcraft/jsch/ChannelSftp.java b/java/com/jcraft/jsch/ChannelSftp.java index d2c0913d..58317170 100644 --- a/java/com/jcraft/jsch/ChannelSftp.java +++ b/java/com/jcraft/jsch/ChannelSftp.java @@ -1382,7 +1382,7 @@ public class ChannelSftp extends ChannelSession{ try{ sendREAD(handle, request_offset, request_len, rq); } - catch(Exception e){ throw new IOException("error"); } + catch(Exception e){ throw new IOException("Error"); } request_offset += request_len; } } @@ -1403,11 +1403,11 @@ public class ChannelSftp extends ChannelSession{ return 0; } catch(SftpException e){ - throw new IOException("error: "+e.toString()); + throw new IOException("Error: "+e.toString()); } if(type!=SSH_FXP_STATUS && type!=SSH_FXP_DATA){ - throw new IOException("error"); + throw new IOException("Error"); } if(type==SSH_FXP_STATUS){ fill(buf, rest_length); @@ -1418,7 +1418,7 @@ public class ChannelSftp extends ChannelSession{ return -1; } //throwStatusError(buf, i); - throw new IOException("error"); + throw new IOException("Error"); } buf.rewind(); @@ -1477,7 +1477,7 @@ public class ChannelSftp extends ChannelSession{ rr.offset+length_of_data, (int)(rr.length-length_of_data), rq); } - catch(Exception e){ throw new IOException("error"); } + catch(Exception e){ throw new IOException("Error"); } request_offset=rr.offset+rr.length; } @@ -1502,7 +1502,7 @@ public class ChannelSftp extends ChannelSession{ if(monitor!=null)monitor.end(); rq.cancel(header, buf); try{_sendCLOSE(handle, header);} - catch(Exception e){throw new IOException("error");} + catch(Exception e){throw new IOException("Error");} } }; return in; diff --git a/java/com/tigervnc/network/TcpSocket.java b/java/com/tigervnc/network/TcpSocket.java index 22e854f5..9863c723 100644 --- a/java/com/tigervnc/network/TcpSocket.java +++ b/java/com/tigervnc/network/TcpSocket.java @@ -185,7 +185,7 @@ public class TcpSocket extends Socket { try { sock.channel.socket().setTcpNoDelay(!enable); } catch(java.net.SocketException e) { - vlog.error("unable to setsockopt TCP_NODELAY: "+e.getMessage()); + vlog.error("Unable to setsockopt TCP_NODELAY: "+e.getMessage()); return false; } return true; diff --git a/java/com/tigervnc/rfb/AliasParameter.java b/java/com/tigervnc/rfb/AliasParameter.java index 3f20ae46..fe0672ee 100644 --- a/java/com/tigervnc/rfb/AliasParameter.java +++ b/java/com/tigervnc/rfb/AliasParameter.java @@ -40,7 +40,7 @@ public class AliasParameter extends VoidParameter { public boolean isBool() { return param.isBool(); } public void setImmutable() { - vlog.debug("set immutable "+getName()+" (Alias)"); + vlog.debug("Set immutable "+getName()+" (Alias)"); param.setImmutable(); } diff --git a/java/com/tigervnc/rfb/CConnection.java b/java/com/tigervnc/rfb/CConnection.java index e0e669d8..b94346b9 100644 --- a/java/com/tigervnc/rfb/CConnection.java +++ b/java/com/tigervnc/rfb/CConnection.java @@ -160,7 +160,7 @@ abstract public class CConnection extends CMsgHandler { int majorVersion; int minorVersion; - vlog.debug("reading protocol version"); + vlog.debug("Reading protocol version"); if (!is.checkNoWait(12)) return; @@ -209,7 +209,7 @@ abstract public class CConnection extends CMsgHandler { private void processSecurityTypesMsg() { - vlog.debug("processing security types message"); + vlog.debug("Processing security types message"); int secType = Security.secTypeInvalid; @@ -292,7 +292,7 @@ abstract public class CConnection extends CMsgHandler { } private void processSecurityMsg() { - vlog.debug("processing security message"); + vlog.debug("Processing security message"); if (csecurity.processMsg(this)) { state_ = stateEnum.RFBSTATE_SECURITY_RESULT; processSecurityResultMsg(); @@ -300,7 +300,7 @@ abstract public class CConnection extends CMsgHandler { } private void processSecurityResultMsg() { - vlog.debug("processing security result message"); + vlog.debug("Processing security result message"); int result; if (server.beforeVersion(3,8) && csecurity.getType() == Security.secTypeNone) { result = Security.secResultOK; @@ -313,10 +313,10 @@ abstract public class CConnection extends CMsgHandler { securityCompleted(); return; case Security.secResultFailed: - vlog.debug("auth failed"); + vlog.debug("Auth failed"); break; case Security.secResultTooMany: - vlog.debug("auth failed - too many tries"); + vlog.debug("Auth failed: Too many tries"); break; default: throw new Exception("Unknown security result from server"); @@ -329,7 +329,7 @@ abstract public class CConnection extends CMsgHandler { } private void processInitMsg() { - vlog.debug("reading server initialisation"); + vlog.debug("Reading server initialisation"); reader_.readServerInit(); } @@ -411,7 +411,7 @@ abstract public class CConnection extends CMsgHandler { super.serverInit(width, height, pf, name); state_ = stateEnum.RFBSTATE_NORMAL; - vlog.debug("initialisation done"); + vlog.debug("Initialisation done"); initDone(); assert(framebuffer != null); diff --git a/java/com/tigervnc/rfb/CMsgReader.java b/java/com/tigervnc/rfb/CMsgReader.java index c71a1e02..52e61e6f 100644 --- a/java/com/tigervnc/rfb/CMsgReader.java +++ b/java/com/tigervnc/rfb/CMsgReader.java @@ -81,8 +81,8 @@ public class CMsgReader { readEndOfContinuousUpdates(); break; default: - vlog.error("unknown message type "+type); - throw new Exception("unknown message type"); + vlog.error("Unknown message type "+type); + throw new Exception("Unknown message type"); } } else { int x = is.readU16(); @@ -154,7 +154,7 @@ public class CMsgReader { if (len > 256*1024) { is.skip(len); - vlog.error("cut text too long ("+len+" bytes) - ignoring"); + vlog.error("Cut text too long ("+len+" bytes) - ignoring"); return; } diff --git a/java/com/tigervnc/rfb/IntParameter.java b/java/com/tigervnc/rfb/IntParameter.java index dcad04a8..ddc8baf4 100644 --- a/java/com/tigervnc/rfb/IntParameter.java +++ b/java/com/tigervnc/rfb/IntParameter.java @@ -40,7 +40,7 @@ public class IntParameter extends VoidParameter { public boolean setParam(String v) { if (immutable) return true; - vlog.debug("set "+getName()+"(Int) to "+v); + vlog.debug("Set "+getName()+"(Int) to "+v); try { int i; i = Integer.parseInt(v); @@ -55,7 +55,7 @@ public class IntParameter extends VoidParameter { public boolean setParam(int v) { if (immutable) return true; - vlog.debug("set "+getName()+"(Int) to "+v); + vlog.debug("Set "+getName()+"(Int) to "+v); if (v < minValue || v > maxValue) return false; value = v; diff --git a/java/com/tigervnc/rfb/VoidParameter.java b/java/com/tigervnc/rfb/VoidParameter.java index 2af0a81d..529c790d 100644 --- a/java/com/tigervnc/rfb/VoidParameter.java +++ b/java/com/tigervnc/rfb/VoidParameter.java @@ -61,7 +61,7 @@ abstract public class VoidParameter { abstract public String getValueStr(); public boolean isBool() { return false; } public void setImmutable() { - vlog.debug("set immutable "+getName()); + vlog.debug("Set immutable "+getName()); immutable = true; } diff --git a/java/com/tigervnc/vncviewer/CConn.java b/java/com/tigervnc/vncviewer/CConn.java index 11b6da44..ff22206d 100644 --- a/java/com/tigervnc/vncviewer/CConn.java +++ b/java/com/tigervnc/vncviewer/CConn.java @@ -113,10 +113,10 @@ public class CConn extends CConnection implements Tunnel.createTunnel(gatewayHost, getServerName(), getServerPort(), localPort); sock = new TcpSocket("localhost", localPort); - vlog.info("connected to localhost port "+localPort); + vlog.info("Connected to localhost port "+localPort); } else { sock = new TcpSocket(getServerName(), getServerPort()); - vlog.info("connected to host "+getServerName()+" port "+getServerPort()); + vlog.info("Connected to host "+getServerName()+" port "+getServerPort()); } } catch (java.lang.Exception e) { throw new Exception(e.getMessage()); @@ -126,7 +126,7 @@ public class CConn extends CConnection implements if (listenMode.getValue()) vlog.info("Accepted connection from " + name); else - vlog.info("connected to host "+Hostname.getHost(name)+" port "+Hostname.getPort(name)); + vlog.info("Connected to host "+Hostname.getHost(name)+" port "+Hostname.getPort(name)); } // See callback below diff --git a/java/com/tigervnc/vncviewer/FileUtils.java b/java/com/tigervnc/vncviewer/FileUtils.java index 6b82d3e2..cb5564be 100644 --- a/java/com/tigervnc/vncviewer/FileUtils.java +++ b/java/com/tigervnc/vncviewer/FileUtils.java @@ -80,7 +80,7 @@ public class FileUtils { return newDir.getPath(); } else { if (legacyDir.exists()) { - vlog.info("WARNING: ~/.vnc is deprecated, please consult 'man vncviewer' for paths to migrate to."); + vlog.info("Warning: ~/.vnc is deprecated, please consult 'man vncviewer' for paths to migrate to."); return legacyDir.getPath(); } String xdgBaseDir = System.getenv(xdgEnv); diff --git a/java/com/tigervnc/vncviewer/LICENCE.TXT b/java/com/tigervnc/vncviewer/LICENCE.TXT index ae3b5319..8aadde97 100644 --- a/java/com/tigervnc/vncviewer/LICENCE.TXT +++ b/java/com/tigervnc/vncviewer/LICENCE.TXT @@ -279,7 +279,7 @@ POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - Appendix: How to Apply These Terms to Your New Programs + Appendix: How to apply these terms to your new programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it diff --git a/java/com/tigervnc/vncviewer/MANIFEST.MF b/java/com/tigervnc/vncviewer/MANIFEST.MF index 4ba75f6a..9e282655 100644 --- a/java/com/tigervnc/vncviewer/MANIFEST.MF +++ b/java/com/tigervnc/vncviewer/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 Main-Class: com.tigervnc.vncviewer.VncViewer -Application-Name: TigerVNC Viewer +Application-Name: TigerVNC viewer Permissions: all-permissions Codebase: * diff --git a/java/com/tigervnc/vncviewer/OptionsDialog.java b/java/com/tigervnc/vncviewer/OptionsDialog.java index 2fbd9d9c..927fdf21 100644 --- a/java/com/tigervnc/vncviewer/OptionsDialog.java +++ b/java/com/tigervnc/vncviewer/OptionsDialog.java @@ -175,7 +175,7 @@ class OptionsDialog extends Dialog { @SuppressWarnings({"rawtypes","unchecked"}) public OptionsDialog() { super(true); - setTitle("VNC Viewer Options"); + setTitle("VNC viewer options"); setResizable(false); getContentPane().setLayout( diff --git a/java/com/tigervnc/vncviewer/Parameters.java b/java/com/tigervnc/vncviewer/Parameters.java index 8c8465cb..dd2f1c3e 100644 --- a/java/com/tigervnc/vncviewer/Parameters.java +++ b/java/com/tigervnc/vncviewer/Parameters.java @@ -192,7 +192,7 @@ public class Parameters { "specified from the point of view of the gateway machine, "+ "e.g. \"localhost\" denotes the gateway, "+ "not the machine on which the viewer was launched. "+ - "See the System Properties section below for "+ + "See the System properties section below for "+ "information on configuring the -Via option.", ""); public static BoolParameter tunnel diff --git a/java/com/tigervnc/vncviewer/README b/java/com/tigervnc/vncviewer/README index 5d5ebf90..404b8eb9 100644 --- a/java/com/tigervnc/vncviewer/README +++ b/java/com/tigervnc/vncviewer/README @@ -1,5 +1,5 @@ -TigerVNC Java Viewer +TigerVNC Java viewer ==================== This distribution is based on the standard VNC source and includes new @@ -27,9 +27,9 @@ available. Installation ============ -The TigerVNC Java Viewer requires installation of either a JRE (Java +The TigerVNC Java viewer requires installation of either a JRE (Java Runtime Environment) or a JDK (Java Development Kit). If VncViewer.jar is -in the current directory, then the TigerVNC Java Viewer can be launched +in the current directory, then the TigerVNC Java viewer can be launched with the following command line: java -jar VncViewer.jar [parameters] @@ -41,7 +41,7 @@ optional parameters supported by VncViewer. Parameters ========== -The TigerVNC Java Viewer accepts a number of optional parameters, allowing you +The TigerVNC Java viewer accepts a number of optional parameters, allowing you to customize its behavior. Example: java -jar VncViewer.jar Port=5901 ScalingFactor=50 diff --git a/java/com/tigervnc/vncviewer/ServerDialog.java b/java/com/tigervnc/vncviewer/ServerDialog.java index 5f75fd3d..01f91db2 100644 --- a/java/com/tigervnc/vncviewer/ServerDialog.java +++ b/java/com/tigervnc/vncviewer/ServerDialog.java @@ -47,7 +47,7 @@ class ServerDialog extends Dialog implements Runnable { super(true); this.vncServerName = vncServerName; setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); - setTitle("VNC Viewer: Connection Details"); + setTitle("VNC viewer: Connection details"); setResizable(false); addWindowListener(new WindowAdapter() { public void windowClosing(WindowEvent e) { diff --git a/java/com/tigervnc/vncviewer/Viewport.java b/java/com/tigervnc/vncviewer/Viewport.java index e12ef2a6..c293cb7d 100644 --- a/java/com/tigervnc/vncviewer/Viewport.java +++ b/java/com/tigervnc/vncviewer/Viewport.java @@ -168,7 +168,7 @@ class Viewport extends JPanel implements ActionListener { if (data[i*4 + 3] != 0) break; if ((i == width*height) && dotWhenNoCursor.getValue()) { - vlog.debug("cursor is empty - using dot"); + vlog.debug("Cursor is empty: Using dot"); cursor = new BufferedImage(5, 5, BufferedImage.TYPE_INT_ARGB_PRE); cursor.setRGB(0, 0, 5, 5, dotcursor_xpm, 0, 5); cursorHotspot.x = cursorHotspot.y = 3; diff --git a/java/com/tigervnc/vncviewer/VncViewer.java b/java/com/tigervnc/vncviewer/VncViewer.java index 067f4eff..4e4364cb 100644 --- a/java/com/tigervnc/vncviewer/VncViewer.java +++ b/java/com/tigervnc/vncviewer/VncViewer.java @@ -61,7 +61,7 @@ import static com.tigervnc.vncviewer.Parameters.*; public class VncViewer implements Runnable { public static final String aboutText = - new String("TigerVNC Java Viewer v%s (%s)%n"+ + new String("TigerVNC Java viewer v%s (%s)%n"+ "Built on %s at %s%n"+ "Copyright (C) 1999-2024 TigerVNC Team and many others (see README.rst)%n"+ "See https://www.tigervnc.org for information on TigerVNC."); @@ -237,7 +237,7 @@ public class VncViewer implements Runnable { Configuration.listParams(79, 14); String propertiesString = ("\n"+ -"System Properties (adapted from the TurboVNC vncviewer man page)\n"+ +"System properties (adapted from the TurboVNC vncviewer man page)\n"+ " When started with the -via option, vncviewer reads the VNC_VIA_CMD\n"+ " System property, expands patterns beginning with the \"%\" character,\n"+ " and uses the resulting command line to establish the secure tunnel\n"+ @@ -359,7 +359,7 @@ public class VncViewer implements Runnable { JOptionPane op = new JOptionPane(msg, JOptionPane.INFORMATION_MESSAGE, JOptionPane.DEFAULT_OPTION, VncViewer.logoIcon, options); - JDialog dlg = op.createDialog(parent, "About TigerVNC Viewer for Java"); + JDialog dlg = op.createDialog(parent, "About TigerVNC viewer for Java"); dlg.setIconImage(VncViewer.frameIcon); dlg.setAlwaysOnTop(true); dlg.setVisible(true); @@ -378,7 +378,7 @@ public class VncViewer implements Runnable { void reportException(java.lang.Exception e) { String title, msg = e.getMessage(); int msgType = JOptionPane.ERROR_MESSAGE; - title = "TigerVNC Viewer : Error"; + title = "TigerVNC viewer : Error"; e.printStackTrace(); JOptionPane.showMessageDialog(null, msg, title, msgType); } diff --git a/release/Info.plist.in b/release/Info.plist.in index 8a88beac..c7505dd1 100644 --- a/release/Info.plist.in +++ b/release/Info.plist.in @@ -5,9 +5,9 @@ <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleDisplayName</key> - <string>TigerVNC Viewer</string> + <string>TigerVNC viewer</string> <key>CFBundleExecutable</key> - <string>TigerVNC Viewer</string> + <string>TigerVNC viewer</string> <key>NSHighResolutionCapable</key> <false/> <key>CFBundleGetInfoString</key> @@ -19,9 +19,9 @@ <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleLongVersionString</key> - <string>TigerVNC Viewer @VERSION@</string> + <string>TigerVNC viewer @VERSION@</string> <key>CFBundleName</key> - <string>TigerVNC Viewer</string> + <string>TigerVNC viewer</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> diff --git a/release/makemacapp.in b/release/makemacapp.in index 7f195eda..10eac996 100644 --- a/release/makemacapp.in +++ b/release/makemacapp.in @@ -37,7 +37,7 @@ fi umask 022 TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX` -APPROOT="$TMPDIR/dmg/TigerVNC Viewer $VERSION.app" +APPROOT="$TMPDIR/dmg/TigerVNC viewer $VERSION.app" mkdir -p "$APPROOT/Contents/MacOS" mkdir -p "$APPROOT/Contents/Resources" diff --git a/release/winvnc.iss.in b/release/winvnc.iss.in index 48ab32bb..773aa175 100644 --- a/release/winvnc.iss.in +++ b/release/winvnc.iss.in @@ -2,13 +2,13 @@ #ifdef WIN64 ArchitecturesInstallIn64BitMode=x64 #endif -AppName=TigerVNC Server -AppVerName=TigerVNC Server v@VERSION@ (@BUILD@) +AppName=TigerVNC server +AppVerName=TigerVNC server v@VERSION@ (@BUILD@) AppVersion=@VERSION@ AppPublisher=TigerVNC project AppPublisherURL=https://tigervnc.org -DefaultDirName={pf}\TigerVNC Server -DefaultGroupName=TigerVNC Server +DefaultDirName={pf}\TigerVNC server +DefaultGroupName=TigerVNC server LicenseFile=@CMAKE_SOURCE_DIR@\LICENCE.TXT [Dirs] @@ -25,20 +25,20 @@ Source: "@CMAKE_SOURCE_DIR@\LICENCE.TXT"; DestDir: "{app}"; Flags: ignoreversion [Icons] -Name: "{group}\VNC Server (User-Mode)\Run VNC Server"; FileName: "{app}\winvnc4.exe"; Parameters: "-noconsole"; -Name: "{group}\VNC Server (User-Mode)\Configure VNC Server"; FileName: "{app}\vncconfig.exe"; Parameters: "-user"; - -Name: "{group}\VNC Server (Service-Mode)\Configure VNC Service"; FileName: "{app}\vncconfig.exe"; Parameters: "-noconsole -service"; -Name: "{group}\VNC Server (Service-Mode)\Register VNC Service"; FileName: "{app}\winvnc4.exe"; Parameters: "-register"; -Name: "{group}\VNC Server (Service-Mode)\Unregister VNC Service"; FileName: "{app}\winvnc4.exe"; Parameters: "-unregister"; -Name: "{group}\VNC Server (Service-Mode)\Start VNC Service"; FileName: "{app}\winvnc4.exe"; Parameters: "-noconsole -start"; -Name: "{group}\VNC Server (Service-Mode)\Stop VNC Service"; FileName: "{app}\winvnc4.exe"; Parameters: "-noconsole -stop"; +Name: "{group}\VNC server (User-Mode)\Run VNC server"; FileName: "{app}\winvnc4.exe"; Parameters: "-noconsole"; +Name: "{group}\VNC server (User-Mode)\Configure VNC server"; FileName: "{app}\vncconfig.exe"; Parameters: "-user"; + +Name: "{group}\VNC server (Service-Mode)\Configure VNC service"; FileName: "{app}\vncconfig.exe"; Parameters: "-noconsole -service"; +Name: "{group}\VNC server (Service-Mode)\Register VNC service"; FileName: "{app}\winvnc4.exe"; Parameters: "-register"; +Name: "{group}\VNC server (Service-Mode)\Unregister VNC service"; FileName: "{app}\winvnc4.exe"; Parameters: "-unregister"; +Name: "{group}\VNC server (Service-Mode)\Start VNC service"; FileName: "{app}\winvnc4.exe"; Parameters: "-noconsole -start"; +Name: "{group}\VNC server (Service-Mode)\Stop VNC service"; FileName: "{app}\winvnc4.exe"; Parameters: "-noconsole -stop"; Name: "{group}\License"; FileName: "write.exe"; Parameters: "LICENCE.TXT"; WorkingDir: "{app}"; Flags: "useapppaths" -Name: "{group}\Read Me"; FileName: "write.exe"; Parameters: "README.rst"; WorkingDir: "{app}"; Flags: "useapppaths" -Name: "{group}\Uninstall TigerVNC Server"; FileName: "{uninstallexe}"; WorkingDir: "{app}"; +Name: "{group}\Read me"; FileName: "write.exe"; Parameters: "README.rst"; WorkingDir: "{app}"; Flags: "useapppaths" +Name: "{group}\Uninstall TigerVNC server"; FileName: "{uninstallexe}"; WorkingDir: "{app}"; [Tasks] -Name: installservice; Description: "&Register new TigerVNC Server as a system service"; GroupDescription: "Server configuration:"; +Name: installservice; Description: "&Register new TigerVNC server as a system service"; GroupDescription: "Server configuration:"; Name: startservice; Description: "&Start or restart TigerVNC service"; GroupDescription: "Server configuration:"; [Run] @@ -106,7 +106,7 @@ var function InitializeSetup: Boolean; begin GetWindowsVersionEx(OSVersion); - MsgBox('TigerVNC Windows Server is currently unmaintained and may not function correctly.', mbError, MB_OK); + MsgBox('TigerVNC Windows server is currently unmaintained and may not function correctly.', mbError, MB_OK); Result := True; end; @@ -137,11 +137,11 @@ begin o Modify Service-Mode start menu commands so they run as administrator. o Set up the SoftwareSASGeneration system policy so as to allow services to simulate Ctrl+Alt+Del. } if (CurStep = ssPostInstall) and (OSVersion.Major >= 6) then begin - SetRunAsUserFlag('{group}\VNC Server (Service-Mode)\Configure VNC Service.lnk'); - SetRunAsUserFlag('{group}\VNC Server (Service-Mode)\Register VNC Service.lnk'); - SetRunAsUserFlag('{group}\VNC Server (Service-Mode)\Unregister VNC Service.lnk'); - SetRunAsUserFlag('{group}\VNC Server (Service-Mode)\Start VNC Service.lnk'); - SetRunAsUserFlag('{group}\VNC Server (Service-Mode)\Stop VNC Service.lnk'); + SetRunAsUserFlag('{group}\VNC server (Service-Mode)\Configure VNC Service.lnk'); + SetRunAsUserFlag('{group}\VNC server (Service-Mode)\Register VNC Service.lnk'); + SetRunAsUserFlag('{group}\VNC server (Service-Mode)\Unregister VNC Service.lnk'); + SetRunAsUserFlag('{group}\VNC server (Service-Mode)\Start VNC Service.lnk'); + SetRunAsUserFlag('{group}\VNC server (Service-Mode)\Stop VNC Service.lnk'); if not RegQueryDWordValue( HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System', 'SoftwareSASGeneration', Flags diff --git a/tests/perf/fbperf.cxx b/tests/perf/fbperf.cxx index 357aede2..e4d0febf 100644 --- a/tests/perf/fbperf.cxx +++ b/tests/perf/fbperf.cxx @@ -344,7 +344,7 @@ static void dotest(TestWindow* win) // We are restricted by some delay, e.g. refresh rate if (is_constant(frames[0]/time[0], frames[2]/time[2])) { - fprintf(stderr, "WARNING: Fixed delay dominating updates.\n\n"); + fprintf(stderr, "Warning: Fixed delay dominating updates.\n\n"); delay = time[2]/frames[2]; rate = 0.0; } @@ -359,7 +359,7 @@ static void dotest(TestWindow* win) // We can hit cache limits that causes performance to drop // with increasing update size, screwing up our calculations if ((pixels[2] / time[2]) < (pixels[0] / time[0] * 0.9)) { - fprintf(stderr, "WARNING: Unexpected behaviour. Measurement unreliable.\n\n"); + fprintf(stderr, "Warning: Unexpected behaviour. Measurement unreliable.\n\n"); // We can't determine the proportions between these, so divide the // time spent evenly diff --git a/unix/vncconfig/QueryConnectDialog.cxx b/unix/vncconfig/QueryConnectDialog.cxx index aa1b78ad..a265356f 100644 --- a/unix/vncconfig/QueryConnectDialog.cxx +++ b/unix/vncconfig/QueryConnectDialog.cxx @@ -30,7 +30,7 @@ QueryConnectDialog::QueryConnectDialog(Display* dpy_, const char* user_, int timeout_, QueryResultCallback* cb) - : TXDialog(dpy_, 300, 100, "VNC Server : Accept Connection?"), + : TXDialog(dpy_, 300, 100, "VNC server : Accept connection?"), addressLbl(dpy, "Host:",this), address(dpy, address_, this), userLbl(dpy, "User:", this), diff --git a/unix/vncconfig/vncconfig.cxx b/unix/vncconfig/vncconfig.cxx index ecc6eddc..d74d18a6 100644 --- a/unix/vncconfig/vncconfig.cxx +++ b/unix/vncconfig/vncconfig.cxx @@ -112,7 +112,7 @@ public: void handleEvent(TXWindow* /*w*/, XEvent* ev) override { if (ev->type == vncExtEventBase + VncExtQueryConnectNotify) { - vlog.debug("query connection event"); + vlog.debug("Query connection event"); if (queryConnectDialog) delete queryConnectDialog; queryConnectDialog = nullptr; diff --git a/unix/vncserver/vncserver.in b/unix/vncserver/vncserver.in index fdcce0e9..03eee275 100755 --- a/unix/vncserver/vncserver.in +++ b/unix/vncserver/vncserver.in @@ -238,7 +238,7 @@ close(XAUTH); $ENV{XAUTHORITY} = $xauthorityFile; -# Now start the X VNC Server +# Now start the X VNC server @cmd = ("xinit"); diff --git a/unix/vncserver/vncserver.users b/unix/vncserver/vncserver.users index 0a63784c..c215acdc 100644 --- a/unix/vncserver/vncserver.users +++ b/unix/vncserver/vncserver.users @@ -1,4 +1,4 @@ -# TigerVNC User assignment +# TigerVNC user assignment # # This file assigns users to specific VNC display numbers. # The syntax is <display>=<username>. E.g.: diff --git a/unix/x0vncserver/Image.cxx b/unix/x0vncserver/Image.cxx index c2026134..bd48c88d 100644 --- a/unix/x0vncserver/Image.cxx +++ b/unix/x0vncserver/Image.cxx @@ -80,7 +80,7 @@ void Image::Init(int width, int height) Visual* vis = DefaultVisual(dpy, DefaultScreen(dpy)); if (vis->c_class != TrueColor) { - vlog.error("pseudocolour not supported"); + vlog.error("Pseudocolour not supported"); exit(1); } @@ -251,7 +251,7 @@ void ShmImage::Init(int width, int height, const XVisualInfo *vinfo) } if (visual->c_class != TrueColor) { - vlog.error("pseudocolour not supported"); + vlog.error("Pseudocolour not supported"); exit(1); } diff --git a/unix/x0vncserver/XDesktop.cxx b/unix/x0vncserver/XDesktop.cxx index 40d84c03..b43e3f79 100644 --- a/unix/x0vncserver/XDesktop.cxx +++ b/unix/x0vncserver/XDesktop.cxx @@ -70,7 +70,7 @@ BoolParameter rawKeyboard("RawKeyboard", "avoid mapping them to the current keyboard " "layout", false); IntParameter queryConnectTimeout("QueryConnectTimeout", - "Number of seconds to show the Accept Connection dialog before " + "Number of seconds to show the 'Accept connection' dialog before " "rejecting the connection", 10); diff --git a/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx index 03f31576..f67bdcc9 100644 --- a/unix/x0vncserver/x0vncserver.cxx +++ b/unix/x0vncserver/x0vncserver.cxx @@ -251,7 +251,7 @@ char* programName; static void printVersion(FILE *fp) { - fprintf(fp, "TigerVNC Server version %s, built %s\n", + fprintf(fp, "TigerVNC server version %s, built %s\n", PACKAGE_VERSION, buildtime); } diff --git a/unix/x0vncserver/x0vncserver.man b/unix/x0vncserver/x0vncserver.man index 5bc8807a..ce4bd6a9 100644 --- a/unix/x0vncserver/x0vncserver.man +++ b/unix/x0vncserver/x0vncserver.man @@ -1,6 +1,6 @@ .TH X0VNCSERVER 1 "" "TigerVNC" "TigerVNC Manual" .SH NAME -x0vncserver \- TigerVNC Server for X displays +x0vncserver \- TigerVNC server for X displays .SH SYNOPSIS .B x0vncserver .RI [ options ] @@ -8,7 +8,7 @@ x0vncserver \- TigerVNC Server for X displays .B x0vncserver -version .SH DESCRIPTION .B x0vncserver -is a TigerVNC Server which makes any X display remotely accessible via VNC, +is a TigerVNC server which makes any X display remotely accessible via VNC, TigerVNC or compatible viewers. Unlike \fBXvnc\fP(1), it does not create a virtual display. Instead, it just shares an existing X server (typically, that one connected to the physical screen). @@ -180,7 +180,7 @@ connections. Default is off. . .TP .B \-QueryConnectTimeout \fIseconds\fP -Number of seconds to show the Accept Connection dialog before rejecting the +Number of seconds to show the Accept connection dialog before rejecting the connection. Default is \fB10\fP. . .TP diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc index f0ab87ab..260ed3a6 100644 --- a/unix/xserver/hw/vnc/XserverDesktop.cc +++ b/unix/xserver/hw/vnc/XserverDesktop.cc @@ -67,7 +67,7 @@ BoolParameter rawKeyboard("RawKeyboard", "layout", false); IntParameter queryConnectTimeout("QueryConnectTimeout", "Number of seconds to show the " - "Accept Connection dialog before " + "Accept connection dialog before " "rejecting the connection", 10); @@ -332,7 +332,7 @@ bool XserverDesktop::handleListenerEvent(int fd, return false; Socket* sock = (*i)->accept(); - vlog.debug("new client, sock %d", sock->getFd()); + vlog.debug("New client, sock %d", sock->getFd()); sockserv->addSocket(sock); vncSetNotifyFd(sock->getFd(), screenIndex, true, false); @@ -379,7 +379,7 @@ void XserverDesktop::blockHandler(int* timeout) for (i = sockets.begin(); i != sockets.end(); i++) { int fd = (*i)->getFd(); if ((*i)->isShutdown()) { - vlog.debug("client gone, sock %d",fd); + vlog.debug("Client gone, sock %d",fd); vncRemoveNotifyFd(fd); server->removeSocket(*i); vncClientGone(fd); @@ -412,14 +412,14 @@ void XserverDesktop::blockHandler(int* timeout) void XserverDesktop::addClient(Socket* sock, bool reverse, bool viewOnly) { - vlog.debug("new client, sock %d reverse %d",sock->getFd(),reverse); + vlog.debug("New client, sock %d reverse %d",sock->getFd(),reverse); server->addSocket(sock, reverse, viewOnly ? AccessView : AccessDefault); vncSetNotifyFd(sock->getFd(), screenIndex, true, false); } void XserverDesktop::disconnectClients() { - vlog.debug("disconnecting all clients"); + vlog.debug("Disconnecting all clients"); return server->closeClients("Disconnection from server end"); } diff --git a/unix/xserver/hw/vnc/Xvnc.man b/unix/xserver/hw/vnc/Xvnc.man index a5659e7d..49b1dc8a 100644 --- a/unix/xserver/hw/vnc/Xvnc.man +++ b/unix/xserver/hw/vnc/Xvnc.man @@ -278,7 +278,7 @@ QueryConnect to be supported. . .TP .B \-QueryConnectTimeout \fIseconds\fP -Number of seconds to show the Accept Connection dialog before rejecting the +Number of seconds to show the Accept connection dialog before rejecting the connection. Default is \fB10\fP. . .TP diff --git a/unix/xserver/hw/vnc/vncExtInit.cc b/unix/xserver/hw/vnc/vncExtInit.cc index e56e0db0..9b8cfe5b 100644 --- a/unix/xserver/hw/vnc/vncExtInit.cc +++ b/unix/xserver/hw/vnc/vncExtInit.cc @@ -141,7 +141,7 @@ static PixelFormat vncGetPixelFormat(int scrIdx) &redMask, &greenMask, &blueMask); if (!trueColour) { - vlog.error("pseudocolour not supported"); + vlog.error("Pseudocolour not supported"); abort(); } @@ -263,12 +263,12 @@ void vncExtensionInit(void) vncGetScreenHeight(), vncFbptr[scr], vncFbstride[scr]); - vlog.info("created VNC server for screen %d", scr); + vlog.info("Created VNC server for screen %d", scr); if (scr == 0 && vncInetdSock != -1 && listeners.empty()) { network::Socket* sock = new network::TcpSocket(vncInetdSock); desktop[scr]->addClient(sock, false, false); - vlog.info("added inetd sock"); + vlog.info("Added inetd sock"); } } diff --git a/unix/xserver/hw/vnc/vncModule.c b/unix/xserver/hw/vnc/vncModule.c index 68900804..5f0886a3 100644 --- a/unix/xserver/hw/vnc/vncModule.c +++ b/unix/xserver/hw/vnc/vncModule.c @@ -50,7 +50,7 @@ ExtensionModule vncExt = static XF86ModuleVersionInfo vncVersRec = { "vnc", - "TigerVNC Project", + "TigerVNC project", MODINFOSTRING1, MODINFOSTRING2, VENDOR_RELEASE, diff --git a/vncviewer/OptionsDialog.cxx b/vncviewer/OptionsDialog.cxx index a7e2de2f..c5f21b24 100644 --- a/vncviewer/OptionsDialog.cxx +++ b/vncviewer/OptionsDialog.cxx @@ -61,7 +61,7 @@ std::map<OptionsCallback*, void*> OptionsDialog::callbacks; static std::set<OptionsDialog *> instances; OptionsDialog::OptionsDialog() - : Fl_Window(580, 420, _("TigerVNC Options")) + : Fl_Window(580, 420, _("TigerVNC options")) { int x, y; Fl_Navigation *navigation; diff --git a/vncviewer/ServerDialog.cxx b/vncviewer/ServerDialog.cxx index e24438d6..e9d4e75b 100644 --- a/vncviewer/ServerDialog.cxx +++ b/vncviewer/ServerDialog.cxx @@ -60,7 +60,7 @@ static LogWriter vlog("ServerDialog"); const char* SERVER_HISTORY="tigervnc.history"; ServerDialog::ServerDialog() - : Fl_Window(450, 0, _("VNC Viewer: Connection Details")) + : Fl_Window(450, 0, _("VNC viewer: Connection details")) { int x, y, x2; Fl_Button *button; @@ -85,7 +85,7 @@ ServerDialog::ServerDialog() button->callback(this->handleLoad, this); x2 += BUTTON_WIDTH + INNER_MARGIN; - button = new Fl_Button(x2, y, BUTTON_WIDTH, BUTTON_HEIGHT, _("Save As...")); + button = new Fl_Button(x2, y, BUTTON_WIDTH, BUTTON_HEIGHT, _("Save as...")); button->callback(this->handleSaveAs, this); x2 += BUTTON_WIDTH + INNER_MARGIN; diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx index 219bb57e..8f7644c3 100644 --- a/vncviewer/Viewport.cxx +++ b/vncviewer/Viewport.cxx @@ -259,7 +259,7 @@ void Viewport::setCursor(int width, int height, const Point& hotspot, if (data[i*4 + 3] != 0) break; if ((i == width*height) && dotWhenNoCursor) { - vlog.debug("cursor is empty - using dot"); + vlog.debug("Cursor is empty, using dot"); Fl_Pixmap pxm(dotcursor_xpm); cursor = new Fl_RGB_Image(&pxm); diff --git a/vncviewer/org.tigervnc.vncviewer.metainfo.xml.in b/vncviewer/org.tigervnc.vncviewer.metainfo.xml.in index 6e982573..0a211a51 100644 --- a/vncviewer/org.tigervnc.vncviewer.metainfo.xml.in +++ b/vncviewer/org.tigervnc.vncviewer.metainfo.xml.in @@ -30,15 +30,15 @@ <launchable type="desktop-id">vncviewer.desktop</launchable> <screenshots> <screenshot type="default"> - <caption>TigerVNC Viewer connection to a CentOS machine</caption> + <caption>TigerVNC viewer connection to a CentOS machine</caption> <image>https://raw.githubusercontent.com/TigerVNC/tigervnc/741d3edbfab65eda6f033078bc06347fe244ea6a/vncviewer/metainfo/tigervnc-connection-linux.jpg</image> </screenshot> <screenshot> - <caption>TigerVNC Viewer connection to a macOS machine</caption> + <caption>TigerVNC viewer connection to a macOS machine</caption> <image>https://raw.githubusercontent.com/TigerVNC/tigervnc/741d3edbfab65eda6f033078bc06347fe244ea6a/vncviewer/metainfo/tigervnc-connection-macos.jpg</image> </screenshot> <screenshot> - <caption>TigerVNC Viewer connection to a Windows machine</caption> + <caption>TigerVNC viewer connection to a Windows machine</caption> <image>https://raw.githubusercontent.com/TigerVNC/tigervnc/741d3edbfab65eda6f033078bc06347fe244ea6a/vncviewer/metainfo/tigervnc-connection-windows.jpg</image> </screenshot> </screenshots> diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx index 5acab1a1..5e2692e8 100644 --- a/vncviewer/vncviewer.cxx +++ b/vncviewer/vncviewer.cxx @@ -101,9 +101,9 @@ static const char *about_text() // encodings, so we need to make sure we get a fresh string every // time. snprintf(buffer, sizeof(buffer), - _("TigerVNC Viewer v%s\n" + _("TigerVNC viewer v%s\n" "Built on: %s\n" - "Copyright (C) 1999-%d TigerVNC Team and many others (see README.rst)\n" + "Copyright (C) 1999-%d TigerVNC team and many others (see README.rst)\n" "See https://www.tigervnc.org for information on TigerVNC."), PACKAGE_VERSION, BUILD_TIMESTAMP, 2024); @@ -263,7 +263,7 @@ static void CleanupSignalHandler(int sig) { // CleanupSignalHandler allows C++ object cleanup to happen because it calls // exit() rather than the default which is to abort. - vlog.info(_("Termination signal %d has been received. TigerVNC Viewer will now exit."), sig); + vlog.info(_("Termination signal %d has been received. TigerVNC viewer will now exit."), sig); exit(1); } @@ -388,7 +388,7 @@ static void init_fltk() fl_message_hotspot(false); // Avoid empty titles for popups - fl_message_title_default(_("TigerVNC Viewer")); + fl_message_title_default(_("TigerVNC viewer")); // FLTK exposes these so that we can translate them. fl_no = _("No"); @@ -411,8 +411,8 @@ static void init_fltk() Fl_Mac_App_Menu::print = ""; // Don't want the print item Fl_Mac_App_Menu::services = _("Services"); - Fl_Mac_App_Menu::hide_others = _("Hide Others"); - Fl_Mac_App_Menu::show = _("Show All"); + Fl_Mac_App_Menu::hide_others = _("Hide others"); + Fl_Mac_App_Menu::show = _("Show all"); fl_mac_set_about(about_callback, nullptr); diff --git a/vncviewer/vncviewer.desktop.in.in b/vncviewer/vncviewer.desktop.in.in index 18f190fc..1a91755c 100644 --- a/vncviewer/vncviewer.desktop.in.in +++ b/vncviewer/vncviewer.desktop.in.in @@ -1,6 +1,6 @@ [Desktop Entry] -Name=TigerVNC Viewer -GenericName=Remote Desktop Viewer +Name=TigerVNC viewer +GenericName=Remote desktop viewer Comment=Connect to VNC server and display remote desktop Exec=@CMAKE_INSTALL_FULL_BINDIR@/vncviewer Icon=tigervnc diff --git a/vncviewer/vncviewer.man b/vncviewer/vncviewer.man index 79c410ae..ade45b78 100644 --- a/vncviewer/vncviewer.man +++ b/vncviewer/vncviewer.man @@ -130,7 +130,7 @@ window will be placed by the window manager by default. .B \-listen \fI[port]\fP Causes vncviewer to listen on the given port (default 5500) for reverse connections from a VNC server. WinVNC supports reverse connections initiated -using the 'Add New Client' menu option or the '\-connect' command-line option. +using the 'Add new client' menu option or the '\-connect' command-line option. Xvnc supports reverse connections with a helper program called .B vncconfig. . diff --git a/vncviewer/vncviewer.rc.in b/vncviewer/vncviewer.rc.in index 074c96ee..a186ee95 100644 --- a/vncviewer/vncviewer.rc.in +++ b/vncviewer/vncviewer.rc.in @@ -42,9 +42,9 @@ BEGIN BLOCK "080904b0" BEGIN VALUE "Comments", "\0" - VALUE "CompanyName", "TigerVNC Project\0" - VALUE "FileDescription", "TigerVNC Client\0" - VALUE "ProductName", "TigerVNC Client\0" + VALUE "CompanyName", "TigerVNC project\0" + VALUE "FileDescription", "TigerVNC client\0" + VALUE "ProductName", "TigerVNC client\0" VALUE "FileVersion", "@RCVERSION@\0" VALUE "InternalName", "vncviewer\0" VALUE "LegalCopyright", "Copyright (C) 1999-2024 TigerVNC Team and many others (see README.rst)\0" diff --git a/win/rfb_win32/CleanDesktop.cxx b/win/rfb_win32/CleanDesktop.cxx index 02fdd374..710c10f5 100644 --- a/win/rfb_win32/CleanDesktop.cxx +++ b/win/rfb_win32/CleanDesktop.cxx @@ -61,7 +61,7 @@ struct ActiveDesktop { HRESULT hr = handle->GetDesktopItem(i, &item, 0); if (hr != S_OK) { - vlog.error("unable to GetDesktopItem %d: %ld", i, hr); + vlog.error("Unable to GetDesktopItem %d: %ld", i, hr); return false; } item.fChecked = enable_; @@ -105,7 +105,7 @@ struct ActiveDesktop { if (hr == S_OK) modifyComponents = (adOptions.fActiveDesktop==0) != (enable_==false); if (hr != S_OK) { - vlog.error("failed to get/set Active Desktop options: %ld", hr); + vlog.error("Failed to get/set Active Desktop options: %ld", hr); return false; } @@ -122,7 +122,7 @@ struct ActiveDesktop { int itemCount = 0; hr = handle->GetDesktopItemCount(&itemCount, 0); if (hr != S_OK) { - vlog.error("failed to get desktop item count: %ld", hr); + vlog.error("Failed to get desktop item count: %ld", hr); return false; } for (int i=0; i<itemCount; i++) { @@ -166,7 +166,7 @@ void CleanDesktop::disableWallpaper() { try { ImpersonateCurrentUser icu; - vlog.debug("disable desktop wallpaper/Active Desktop"); + vlog.debug("Disable desktop wallpaper/Active Desktop"); // -=- First attempt to remove the wallpaper using Active Desktop try { @@ -191,7 +191,7 @@ void CleanDesktop::enableWallpaper() { ImpersonateCurrentUser icu; if (restoreActiveDesktop) { - vlog.debug("restore Active Desktop"); + vlog.debug("Restore Active Desktop"); // -=- First attempt to re-enable Active Desktop try { @@ -204,7 +204,7 @@ void CleanDesktop::enableWallpaper() { } if (restoreWallpaper) { - vlog.debug("restore desktop wallpaper"); + vlog.debug("Restore desktop wallpaper"); // -=- Then restore the standard wallpaper if required SysParamsInfo(SPI_SETDESKWALLPAPER, 0, nullptr, SPIF_SENDCHANGE); @@ -221,7 +221,7 @@ void CleanDesktop::disableEffects() { try { ImpersonateCurrentUser icu; - vlog.debug("disable desktop effects"); + vlog.debug("Disable desktop effects"); SysParamsInfo(SPI_SETFONTSMOOTHING, FALSE, nullptr, SPIF_SENDCHANGE); if (SysParamsInfo(SPI_GETUIEFFECTS, 0, &uiEffects, 0) == ERROR_CALL_NOT_IMPLEMENTED) { @@ -253,7 +253,7 @@ void CleanDesktop::enableEffects() { if (restoreEffects) { ImpersonateCurrentUser icu; - vlog.debug("restore desktop effects"); + vlog.debug("Restore desktop effects"); RegKey desktopCfg; desktopCfg.openKey(HKEY_CURRENT_USER, "Control Panel\\Desktop"); diff --git a/win/rfb_win32/Clipboard.cxx b/win/rfb_win32/Clipboard.cxx index 8577df46..2a2be1d5 100644 --- a/win/rfb_win32/Clipboard.cxx +++ b/win/rfb_win32/Clipboard.cxx @@ -43,11 +43,11 @@ static LogWriter vlog("Clipboard"); Clipboard::Clipboard() : MsgWindow("Clipboard"), notifier(nullptr), next_window(nullptr) { next_window = SetClipboardViewer(getHandle()); - vlog.debug("registered clipboard handler"); + vlog.debug("Registered clipboard handler"); } Clipboard::~Clipboard() { - vlog.debug("removing %p from chain (next is %p)", getHandle(), next_window); + vlog.debug("Removing %p from chain (next is %p)", getHandle(), next_window); ChangeClipboardChain(getHandle(), next_window); } @@ -56,26 +56,26 @@ Clipboard::processMessage(UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { case WM_CHANGECBCHAIN: - vlog.debug("change clipboard chain (%I64x, %I64x)", + vlog.debug("Change clipboard chain (%I64x, %I64x)", (long long)wParam, (long long)lParam); if ((HWND) wParam == next_window) next_window = (HWND) lParam; else if (next_window != nullptr) SendMessage(next_window, msg, wParam, lParam); else - vlog.error("bad clipboard chain change!"); + vlog.error("Bad clipboard chain change!"); break; case WM_DRAWCLIPBOARD: { HWND owner = GetClipboardOwner(); if (owner == getHandle()) { - vlog.debug("local clipboard changed by me"); + vlog.debug("Local clipboard changed by me"); } else { - vlog.debug("local clipboard changed by %p", owner); + vlog.debug("Local clipboard changed by %p", owner); if (notifier == nullptr) - vlog.debug("no clipboard notifier registered"); + vlog.debug("No clipboard notifier registered"); else notifier->notifyClipboardChanged(IsClipboardFormatAvailable(CF_UNICODETEXT)); } @@ -151,18 +151,18 @@ Clipboard::setClipText(const char* text) { throw rdr::win32_error("unable to set Win32 clipboard", GetLastError()); clip_handle = nullptr; - vlog.debug("set clipboard"); + vlog.debug("Set clipboard"); } catch (std::exception& e) { vlog.debug("%s", e.what()); } // - Close the clipboard if (!CloseClipboard()) - vlog.debug("unable to close Win32 clipboard: %lu", GetLastError()); + vlog.debug("Unable to close Win32 clipboard: %lu", GetLastError()); else - vlog.debug("closed clipboard"); + vlog.debug("Closed clipboard"); if (clip_handle) { - vlog.debug("freeing clipboard handle"); + vlog.debug("Freeing clipboard handle"); GlobalFree(clip_handle); } } diff --git a/win/rfb_win32/CurrentUser.cxx b/win/rfb_win32/CurrentUser.cxx index be363682..a9404c94 100644 --- a/win/rfb_win32/CurrentUser.cxx +++ b/win/rfb_win32/CurrentUser.cxx @@ -41,7 +41,7 @@ BOOL CALLBACK enumWindows(HWND hwnd, LPARAM lParam) { char className[16]; if (GetClassName(hwnd, className, sizeof(className)) && (strcmp(className, shellIconClass) == 0)) { - vlog.debug("located tray icon window (%s)", className); + vlog.debug("Located tray icon window (%s)", className); DWORD processId = 0; GetWindowThreadProcessId(hwnd, &processId); if (!processId) @@ -51,7 +51,7 @@ BOOL CALLBACK enumWindows(HWND hwnd, LPARAM lParam) { return TRUE; if (!OpenProcessToken(process, MAXIMUM_ALLOWED, (HANDLE*)lParam)) return TRUE; - vlog.debug("obtained user token"); + vlog.debug("Obtained user token"); return FALSE; } return TRUE; @@ -59,14 +59,14 @@ BOOL CALLBACK enumWindows(HWND hwnd, LPARAM lParam) { BOOL CALLBACK enumDesktops(LPTSTR lpszDesktop, LPARAM lParam) { HDESK desktop = OpenDesktop(lpszDesktop, 0, FALSE, DESKTOP_ENUMERATE); - vlog.debug("opening \"%s\"", lpszDesktop); + vlog.debug("Opening \"%s\"", lpszDesktop); if (!desktop) { - vlog.info("desktop \"%s\" inaccessible", lpszDesktop); + vlog.info("Desktop \"%s\" inaccessible", lpszDesktop); return TRUE; } BOOL result = EnumDesktopWindows(desktop, enumWindows, lParam); if (!CloseDesktop(desktop)) - vlog.info("unable to close desktop: %ld", GetLastError()); + vlog.info("Unable to close desktop: %ld", GetLastError()); return result; } diff --git a/win/rfb_win32/DIBSectionBuffer.cxx b/win/rfb_win32/DIBSectionBuffer.cxx index 440fe6b1..e2cb15c1 100644 --- a/win/rfb_win32/DIBSectionBuffer.cxx +++ b/win/rfb_win32/DIBSectionBuffer.cxx @@ -92,11 +92,11 @@ void DIBSectionBuffer::initBuffer(const PixelFormat& pf, int w, int h) { vlog.debug("recreateBuffer()"); } else { - vlog.debug("one of area or format not set"); + vlog.debug("One of area or format not set"); } if (new_bitmap && bitmap) { - vlog.debug("preserving bitmap contents"); + vlog.debug("Preserving bitmap contents"); // Copy the contents across if (device) { @@ -139,7 +139,7 @@ void DIBSectionBuffer::initBuffer(const PixelFormat& pf, int w, int h) { if (bytesPerRow % 4) { bytesPerRow += 4 - (bytesPerRow % 4); new_stride = (bytesPerRow * 8) / format.bpp; - vlog.info("adjusting DIB stride: %d to %d", w, new_stride); + vlog.info("Adjusting DIB stride: %d to %d", w, new_stride); } setBuffer(w, h, new_data, new_stride); diff --git a/win/rfb_win32/DeviceContext.cxx b/win/rfb_win32/DeviceContext.cxx index 1c64e1f5..353ee716 100644 --- a/win/rfb_win32/DeviceContext.cxx +++ b/win/rfb_win32/DeviceContext.cxx @@ -86,7 +86,7 @@ PixelFormat DeviceContext::getPF(HDC dc) { bMask = 0x0000ff; break; default: - vlog.error("bits per pixel %u not supported", bi.bmiHeader.biBitCount); + vlog.error("Bits per pixel %u not supported", bi.bmiHeader.biBitCount); throw std::invalid_argument("unknown bits per pixel specified"); }; break; diff --git a/win/rfb_win32/DeviceFrameBuffer.cxx b/win/rfb_win32/DeviceFrameBuffer.cxx index 1c3e9575..6e38d6a8 100644 --- a/win/rfb_win32/DeviceFrameBuffer.cxx +++ b/win/rfb_win32/DeviceFrameBuffer.cxx @@ -256,7 +256,7 @@ void DeviceFrameBuffer::setCursor(HCURSOR hCursor, VNCServer* server) } if (doOutline) { - vlog.debug("drawing cursor outline!"); + vlog.debug("Drawing cursor outline!"); // The buffer needs to be slightly larger to make sure there // is room for the outline pixels diff --git a/win/rfb_win32/Dialog.cxx b/win/rfb_win32/Dialog.cxx index e8af0846..f147df45 100644 --- a/win/rfb_win32/Dialog.cxx +++ b/win/rfb_win32/Dialog.cxx @@ -306,7 +306,7 @@ bool PropSheet::showPropSheet(HWND owner_, bool showApply, bool showCtxtHelp, bo } char filename[256]; sprintf(filename, "%s\\%s.bmp", tmpdir, title); - vlog.debug("writing to %s", filename); + vlog.debug("Writing to %s", filename); saveBMP(filename, &fb); i++; } diff --git a/win/rfb_win32/MonitorInfo.cxx b/win/rfb_win32/MonitorInfo.cxx index 84a8d501..9f7c2daf 100644 --- a/win/rfb_win32/MonitorInfo.cxx +++ b/win/rfb_win32/MonitorInfo.cxx @@ -45,9 +45,9 @@ static void fillMonitorInfo(HMONITOR monitor, MONITORINFOEXA* mi) { mi->cbSize = sizeof(MONITORINFOEXA); if (!GetMonitorInfo(monitor, mi)) throw rdr::win32_error("failed to GetMonitorInfo", GetLastError()); - vlog.debug("monitor is %ld,%ld-%ld,%ld", mi->rcMonitor.left, mi->rcMonitor.top, mi->rcMonitor.right, mi->rcMonitor.bottom); - vlog.debug("work area is %ld,%ld-%ld,%ld", mi->rcWork.left, mi->rcWork.top, mi->rcWork.right, mi->rcWork.bottom); - vlog.debug("device is \"%s\"", mi->szDevice); + vlog.debug("Monitor is %ld,%ld-%ld,%ld", mi->rcMonitor.left, mi->rcMonitor.top, mi->rcMonitor.right, mi->rcMonitor.bottom); + vlog.debug("Work area is %ld,%ld-%ld,%ld", mi->rcWork.left, mi->rcWork.top, mi->rcWork.right, mi->rcWork.bottom); + vlog.debug("Device is \"%s\"", mi->szDevice); } diff --git a/win/rfb_win32/MsgWindow.cxx b/win/rfb_win32/MsgWindow.cxx index 4908126e..bd35ca0f 100644 --- a/win/rfb_win32/MsgWindow.cxx +++ b/win/rfb_win32/MsgWindow.cxx @@ -55,14 +55,14 @@ LRESULT CALLBACK MsgWindowProc(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam) SetWindowLongPtr(wnd, GWLP_USERDATA, 0); MsgWindow* _this = (MsgWindow*) GetWindowLongPtr(wnd, GWLP_USERDATA); if (!_this) { - vlog.info("null _this in %p, message %x", wnd, msg); + vlog.info("Null _this in %p, message %x", wnd, msg); return SafeDefWindowProc(wnd, msg, wParam, lParam); } try { result = _this->processMessage(msg, wParam, lParam); } catch (std::exception& e) { - vlog.error("untrapped: %s", e.what()); + vlog.error("Untrapped: %s", e.what()); } return result; @@ -99,20 +99,20 @@ static MsgWindowClass baseClass; // MsgWindow::MsgWindow(const char* name_) : name(name_), handle(nullptr) { - vlog.debug("creating window \"%s\"", name.c_str()); + vlog.debug("Creating window \"%s\"", name.c_str()); handle = CreateWindow((const char*)(intptr_t)baseClass.classAtom, name.c_str(), WS_OVERLAPPED, 0, 0, 10, 10, nullptr, nullptr, baseClass.instance, this); if (!handle) { throw rdr::win32_error("unable to create WMNotifier window instance", GetLastError()); } - vlog.debug("created window \"%s\" (%p)", name.c_str(), handle); + vlog.debug("Created window \"%s\" (%p)", name.c_str(), handle); } MsgWindow::~MsgWindow() { if (handle) DestroyWindow(handle); - vlog.debug("destroyed window \"%s\" (%p)", name.c_str(), handle); + vlog.debug("Destroyed window \"%s\" (%p)", name.c_str(), handle); } LRESULT diff --git a/win/rfb_win32/RegConfig.cxx b/win/rfb_win32/RegConfig.cxx index 211570ca..d9835201 100644 --- a/win/rfb_win32/RegConfig.cxx +++ b/win/rfb_win32/RegConfig.cxx @@ -67,7 +67,7 @@ void RegConfig::loadRegistryConfig(RegKey& key) { if (!name) break; std::string value = key.getRepresentation(name); if (!Configuration::setParam(name, value.c_str())) - vlog.info("unable to process %s", name); + vlog.info("Unable to process %s", name); } } catch (rdr::win32_error& e) { if (e.err != ERROR_INVALID_HANDLE) @@ -76,7 +76,7 @@ void RegConfig::loadRegistryConfig(RegKey& key) { } void RegConfig::processEvent(HANDLE /*event*/) { - vlog.info("registry changed"); + vlog.info("Registry changed"); // Reinstate the registry change notifications ResetEvent(event); diff --git a/win/rfb_win32/Registry.cxx b/win/rfb_win32/Registry.cxx index 47756950..27e55a2e 100644 --- a/win/rfb_win32/Registry.cxx +++ b/win/rfb_win32/Registry.cxx @@ -55,7 +55,7 @@ RegKey::RegKey(const HKEY k) : key(nullptr), freeKey(false), valueName(nullptr), LONG result = RegOpenKeyEx(k, nullptr, 0, KEY_ALL_ACCESS, &key); if (result != ERROR_SUCCESS) throw rdr::win32_error("RegOpenKeyEx(HKEY)", result); - vlog.debug("duplicated %p to %p", k, key); + vlog.debug("Duplicated %p to %p", k, key); freeKey = true; } @@ -63,7 +63,7 @@ RegKey::RegKey(const RegKey& k) : key(nullptr), freeKey(false), valueName(nullpt LONG result = RegOpenKeyEx(k.key, nullptr, 0, KEY_ALL_ACCESS, &key); if (result != ERROR_SUCCESS) throw rdr::win32_error("RegOpenKeyEx(RegKey&)", result); - vlog.debug("duplicated %p to %p", k.key, key); + vlog.debug("Duplicated %p to %p", k.key, key); freeKey = true; } diff --git a/win/rfb_win32/SDisplay.cxx b/win/rfb_win32/SDisplay.cxx index 33f2d6c9..ee339649 100644 --- a/win/rfb_win32/SDisplay.cxx +++ b/win/rfb_win32/SDisplay.cxx @@ -102,7 +102,7 @@ void SDisplay::init(VNCServer* vs) void SDisplay::start() { - vlog.debug("starting"); + vlog.debug("Starting"); // Try to make session zero the console session if (!inConsoleSession()) @@ -111,26 +111,26 @@ void SDisplay::start() // Start the SDisplay core startCore(); - vlog.debug("started"); + vlog.debug("Started"); if (statusLocation) *statusLocation = true; } void SDisplay::stop() { - vlog.debug("stopping"); + vlog.debug("Stopping"); // If we successfully start()ed then perform the DisconnectAction if (core) { CurrentUserToken cut; if (stricmp(disconnectAction, "Logoff") == 0) { if (!cut.h) - vlog.info("ignoring DisconnectAction=Logoff - no current user"); + vlog.info("Ignoring DisconnectAction=Logoff - no current user"); else ExitWindowsEx(EWX_LOGOFF, 0); } else if (stricmp(disconnectAction, "Lock") == 0) { if (!cut.h) { - vlog.info("ignoring DisconnectAction=Lock - no current user"); + vlog.info("Ignoring DisconnectAction=Lock - no current user"); } else { LockWorkStation(); } @@ -141,7 +141,7 @@ void SDisplay::stop() server->setPixelBuffer(nullptr); stopCore(); - vlog.debug("stopped"); + vlog.debug("Stopped"); if (statusLocation) *statusLocation = false; } @@ -278,14 +278,14 @@ bool SDisplay::isRestartRequired() { void SDisplay::restartCore() { - vlog.info("restarting"); + vlog.info("Restarting"); // Stop the existing Core related resources stopCore(); try { // Start a new Core if possible startCore(); - vlog.info("restarted"); + vlog.info("Restarted"); } catch (std::exception& e) { // If startCore() fails then we MUST disconnect all clients, // to cause the server to stop() the desktop. @@ -351,7 +351,7 @@ bool SDisplay::checkLedState() { void SDisplay::notifyClipboardChanged(bool available) { - vlog.debug("clipboard text changed"); + vlog.debug("Clipboard text changed"); if (server) server->announceClipboard(available); } @@ -361,15 +361,15 @@ void SDisplay::notifyDisplayEvent(WMMonitor::Notifier::DisplayEventType evt) { switch (evt) { case WMMonitor::Notifier::DisplaySizeChanged: - vlog.debug("desktop size changed"); + vlog.debug("Desktop size changed"); recreatePixelBuffer(); break; case WMMonitor::Notifier::DisplayPixelFormatChanged: - vlog.debug("desktop format changed"); + vlog.debug("Desktop format changed"); recreatePixelBuffer(); break; default: - vlog.error("unknown display event received"); + vlog.error("Unknown display event received"); } } @@ -381,7 +381,7 @@ SDisplay::processEvent(HANDLE event) { // - If the SDisplay isn't even started then quit now if (!core) { - vlog.error("not start()ed"); + vlog.error("Not start()ed"); return; } @@ -479,14 +479,14 @@ SDisplay::recreatePixelBuffer(bool force) { flushChangeTracker(); // Delete the old pixelbuffer and device context - vlog.debug("deleting old pixel buffer & device"); + vlog.debug("Deleting old pixel buffer & device"); if (pb) delete pb; if (device) delete device; // Create a DeviceFrameBuffer attached to the new device - vlog.debug("creating pixel buffer"); + vlog.debug("Creating pixel buffer"); DeviceFrameBuffer* new_buffer = new DeviceFrameBuffer(*new_device); // Replace the old PixelBuffer diff --git a/win/rfb_win32/SInput.cxx b/win/rfb_win32/SInput.cxx index af5aeb06..13ac9f26 100644 --- a/win/rfb_win32/SInput.cxx +++ b/win/rfb_win32/SInput.cxx @@ -91,7 +91,7 @@ win32::SPointer::pointerEvent(const Point& pos, uint16_t buttonmask) if (buttonmask & (1<<i)) { flags |= buttonDownMapping[i]; if (buttonDataMapping[i]) { - if (data) vlog.info("warning - two buttons set mouse_event data field"); + if (data) vlog.info("Warning: Two buttons set mouse_event data field"); data = buttonDataMapping[i]; } } else { @@ -412,7 +412,7 @@ void win32::SKeyboard::keyEvent(uint32_t keysym, uint32_t keycode, bool down) SHORT dc = VkKeyScan(keysym); if (dc != -1) { if (down) { - vlog.info("latin-1 dead key: 0x%x vkCode 0x%x mod 0x%x " + vlog.info("Latin-1 dead key: 0x%x vkCode 0x%x mod 0x%x " "followed by space", keysym, LOBYTE(dc), HIBYTE(dc)); doKeyEventWithModifiers(LOBYTE(dc), HIBYTE(dc), true); doKeyEventWithModifiers(LOBYTE(dc), HIBYTE(dc), false); @@ -438,7 +438,7 @@ void win32::SKeyboard::keyEvent(uint32_t keysym, uint32_t keycode, bool down) SHORT dc = VkKeyScan(latin1ToDeadChars[j].deadChar); SHORT bc = VkKeyScan(latin1ToDeadChars[j].baseChar); if (dc != -1 && bc != -1) { - vlog.info("latin-1 key: 0x%x dead key vkCode 0x%x mod 0x%x " + vlog.info("Latin-1 key: 0x%x dead key vkCode 0x%x mod 0x%x " "followed by vkCode 0x%x mod 0x%x", keysym, LOBYTE(dc), HIBYTE(dc), LOBYTE(bc), HIBYTE(bc)); @@ -454,14 +454,14 @@ void win32::SKeyboard::keyEvent(uint32_t keysym, uint32_t keycode, bool down) break; } } - vlog.info("ignoring unrecognised Latin-1 keysym 0x%x",keysym); + vlog.info("Ignoring unrecognised Latin-1 keysym 0x%x",keysym); } return; } BYTE vkCode = LOBYTE(s); BYTE modifierState = HIBYTE(s); - vlog.debug("latin-1 key: 0x%x vkCode 0x%x mod 0x%x down %d", + vlog.debug("Latin-1 key: 0x%x vkCode 0x%x mod 0x%x down %d", keysym, vkCode, modifierState, down); doKeyEventWithModifiers(vkCode, modifierState, down); @@ -470,7 +470,7 @@ void win32::SKeyboard::keyEvent(uint32_t keysym, uint32_t keycode, bool down) // see if it's a recognised keyboard key, otherwise ignore it if (vkMap.find(keysym) == vkMap.end()) { - vlog.info("ignoring unknown keysym 0x%x",keysym); + vlog.info("Ignoring unknown keysym 0x%x",keysym); return; } BYTE vkCode = vkMap[keysym]; @@ -478,7 +478,7 @@ void win32::SKeyboard::keyEvent(uint32_t keysym, uint32_t keycode, bool down) if (extendedMap[keysym]) flags |= KEYEVENTF_EXTENDEDKEY; if (!down) flags |= KEYEVENTF_KEYUP; - vlog.debug("keyboard key: keysym 0x%x vkCode 0x%x ext %d down %d", + vlog.debug("Keyboard key: keysym 0x%x vkCode 0x%x ext %d down %d", keysym, vkCode, extendedMap[keysym], down); if (down && (vkCode == VK_DELETE) && ((GetAsyncKeyState(VK_CONTROL) & 0x8000) != 0) && diff --git a/win/rfb_win32/Service.cxx b/win/rfb_win32/Service.cxx index 907e3214..bc9875e5 100644 --- a/win/rfb_win32/Service.cxx +++ b/win/rfb_win32/Service.cxx @@ -48,43 +48,43 @@ bool runAsService = false; VOID WINAPI serviceHandler(DWORD control) { switch (control) { case SERVICE_CONTROL_INTERROGATE: - vlog.info("cmd: report status"); + vlog.info("CMD: Report status"); service->setStatus(); return; case SERVICE_CONTROL_PARAMCHANGE: - vlog.info("cmd: param change"); + vlog.info("CMD: Param change"); service->readParams(); return; case SERVICE_CONTROL_SHUTDOWN: - vlog.info("cmd: OS shutdown"); + vlog.info("CMD: OS shutdown"); service->osShuttingDown(); return; case SERVICE_CONTROL_STOP: - vlog.info("cmd: stop"); + vlog.info("CMD: Stop"); service->setStatus(SERVICE_STOP_PENDING); service->stop(); return; }; - vlog.debug("cmd: unknown %lu", control); + vlog.debug("CMD: Unknown %lu", control); } // -=- Service main procedure VOID WINAPI serviceProc(DWORD dwArgc, LPTSTR* lpszArgv) { - vlog.debug("entering %s serviceProc", service->getName()); - vlog.info("registering handler..."); + vlog.debug("Entering %s serviceProc", service->getName()); + vlog.info("Registering handler..."); service->status_handle = RegisterServiceCtrlHandler(service->getName(), serviceHandler); if (!service->status_handle) { DWORD err = GetLastError(); - vlog.error("failed to register handler: %lu", err); + vlog.error("Failed to register handler: %lu", err); ExitProcess(err); } - vlog.debug("registered handler (%p)", service->status_handle); + vlog.debug("Registered handler (%p)", service->status_handle); service->setStatus(SERVICE_START_PENDING); - vlog.debug("entering %s serviceMain", service->getName()); + vlog.debug("Entering %s serviceMain", service->getName()); service->status.dwWin32ExitCode = service->serviceMain(dwArgc, lpszArgv); - vlog.debug("leaving %s serviceMain", service->getName()); + vlog.debug("Leaving %s serviceMain", service->getName()); service->setStatus(SERVICE_STOPPED); } @@ -110,12 +110,12 @@ Service::start() { entry[0].lpServiceProc = serviceProc; entry[1].lpServiceName = nullptr; entry[1].lpServiceProc = nullptr; - vlog.debug("entering dispatcher"); + vlog.debug("Entering dispatcher"); if (!SetProcessShutdownParameters(0x100, 0)) - vlog.error("unable to set shutdown parameters: %lu", GetLastError()); + vlog.error("Unable to set shutdown parameters: %lu", GetLastError()); service = this; if (!StartServiceCtrlDispatcher(entry)) - throw win32_error("unable to start service", GetLastError()); + throw win32_error("Unable to start service", GetLastError()); } void @@ -126,7 +126,7 @@ Service::setStatus() { void Service::setStatus(DWORD state) { if (status_handle == nullptr) { - vlog.debug("warning - cannot setStatus"); + vlog.debug("Warning: Cannot setStatus"); return; } status.dwCurrentState = state; @@ -134,9 +134,9 @@ Service::setStatus(DWORD state) { if (!SetServiceStatus(status_handle, &status)) { status.dwCurrentState = SERVICE_STOPPED; status.dwWin32ExitCode = GetLastError(); - vlog.error("unable to set service status:%lu", status.dwWin32ExitCode); + vlog.error("Unable to set service status:%lu", status.dwWin32ExitCode); } - vlog.debug("set status to %lu(%lu)", state, status.dwCheckPoint); + vlog.debug("Set status to %lu(%lu)", state, status.dwCheckPoint); } Service::~Service() { @@ -162,7 +162,7 @@ switchToDesktop(HDESK desktop) { return false; } if (!CloseDesktop(old_desktop)) - vlog.debug("unable to close old desktop:%lu", GetLastError()); + vlog.debug("Unable to close old desktop:%lu", GetLastError()); return true; } @@ -176,7 +176,7 @@ inputDesktopSelected() { DESKTOP_WRITEOBJECTS | DESKTOP_READOBJECTS | DESKTOP_SWITCHDESKTOP | GENERIC_WRITE); if (!input) { - vlog.debug("unable to OpenInputDesktop(1):%lu", GetLastError()); + vlog.debug("Unable to OpenInputDesktop(1):%lu", GetLastError()); return false; } @@ -185,17 +185,17 @@ inputDesktopSelected() { char inputname[256]; if (!GetUserObjectInformation(current, UOI_NAME, currentname, 256, &size)) { - vlog.debug("unable to GetUserObjectInformation(1):%lu", GetLastError()); + vlog.debug("Unable to GetUserObjectInformation(1):%lu", GetLastError()); CloseDesktop(input); return false; } if (!GetUserObjectInformation(input, UOI_NAME, inputname, 256, &size)) { - vlog.debug("unable to GetUserObjectInformation(2):%lu", GetLastError()); + vlog.debug("Unable to GetUserObjectInformation(2):%lu", GetLastError()); CloseDesktop(input); return false; } if (!CloseDesktop(input)) - vlog.debug("unable to close input desktop:%lu", GetLastError()); + vlog.debug("Unable to close input desktop:%lu", GetLastError()); // *** vlog.debug("current=%s, input=%s", currentname, inputname); bool result = strcmp(currentname, inputname) == 0; @@ -212,7 +212,7 @@ selectInputDesktop() { DESKTOP_WRITEOBJECTS | DESKTOP_READOBJECTS | DESKTOP_SWITCHDESKTOP | GENERIC_WRITE); if (!desktop) { - vlog.debug("unable to OpenInputDesktop(2):%lu", GetLastError()); + vlog.debug("Unable to OpenInputDesktop(2):%lu", GetLastError()); return false; } @@ -226,11 +226,11 @@ selectInputDesktop() { DWORD size = 256; char currentname[256]; if (GetUserObjectInformation(desktop, UOI_NAME, currentname, 256, &size)) { - vlog.debug("switched to %s", currentname); + vlog.debug("Switched to %s", currentname); } // *** - vlog.debug("switched to input desktop"); + vlog.debug("Switched to input desktop"); return true; } @@ -335,7 +335,7 @@ bool rfb::win32::registerService(const char* name, // - Open the SCM ServiceHandle scm = OpenSCManager(nullptr, nullptr, SC_MANAGER_CREATE_SERVICE); if (!scm) - throw rdr::win32_error("unable to open Service Control Manager", GetLastError()); + throw rdr::win32_error("Unable to open Service Control Manager", GetLastError()); // - Add the service ServiceHandle handle = CreateService(scm, @@ -344,7 +344,7 @@ bool rfb::win32::registerService(const char* name, SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, cmdline.c_str(), nullptr, nullptr, nullptr, nullptr, nullptr); if (!handle) - throw rdr::win32_error("unable to create service", GetLastError()); + throw rdr::win32_error("Unable to create service", GetLastError()); // - Set a description SERVICE_DESCRIPTION sdesc = {(LPTSTR)desc}; @@ -380,14 +380,14 @@ bool rfb::win32::unregisterService(const char* name) { // - Open the SCM ServiceHandle scm = OpenSCManager(nullptr, nullptr, SC_MANAGER_CREATE_SERVICE); if (!scm) - throw rdr::win32_error("unable to open Service Control Manager", GetLastError()); + throw rdr::win32_error("Unable to open Service Control Manager", GetLastError()); // - Create the service ServiceHandle handle = OpenService(scm, name, SC_MANAGER_ALL_ACCESS); if (!handle) - throw rdr::win32_error("unable to locate the service", GetLastError()); + throw rdr::win32_error("Unable to locate the service", GetLastError()); if (!DeleteService(handle)) - throw rdr::win32_error("unable to remove the service", GetLastError()); + throw rdr::win32_error("Unable to remove the service", GetLastError()); // - Register the event log source RegKey hk; @@ -407,16 +407,16 @@ bool rfb::win32::startService(const char* name) { // - Open the SCM ServiceHandle scm = OpenSCManager(nullptr, nullptr, SC_MANAGER_CONNECT); if (!scm) - throw rdr::win32_error("unable to open Service Control Manager", GetLastError()); + throw rdr::win32_error("Unable to open Service Control Manager", GetLastError()); // - Locate the service ServiceHandle handle = OpenService(scm, name, SERVICE_START); if (!handle) - throw rdr::win32_error("unable to open the service", GetLastError()); + throw rdr::win32_error("Unable to open the service", GetLastError()); // - Start the service if (!StartService(handle, 0, nullptr)) - throw rdr::win32_error("unable to start the service", GetLastError()); + throw rdr::win32_error("Unable to start the service", GetLastError()); Sleep(500); @@ -427,17 +427,17 @@ bool rfb::win32::stopService(const char* name) { // - Open the SCM ServiceHandle scm = OpenSCManager(nullptr, nullptr, SC_MANAGER_CONNECT); if (!scm) - throw rdr::win32_error("unable to open Service Control Manager", GetLastError()); + throw rdr::win32_error("Unable to open Service Control Manager", GetLastError()); // - Locate the service ServiceHandle handle = OpenService(scm, name, SERVICE_STOP); if (!handle) - throw rdr::win32_error("unable to open the service", GetLastError()); + throw rdr::win32_error("Unable to open the service", GetLastError()); // - Start the service SERVICE_STATUS status; if (!ControlService(handle, SERVICE_CONTROL_STOP, &status)) - throw rdr::win32_error("unable to stop the service", GetLastError()); + throw rdr::win32_error("Unable to stop the service", GetLastError()); Sleep(500); @@ -448,17 +448,17 @@ DWORD rfb::win32::getServiceState(const char* name) { // - Open the SCM ServiceHandle scm = OpenSCManager(nullptr, nullptr, SC_MANAGER_CONNECT); if (!scm) - throw rdr::win32_error("unable to open Service Control Manager", GetLastError()); + throw rdr::win32_error("Unable to open Service Control Manager", GetLastError()); // - Locate the service ServiceHandle handle = OpenService(scm, name, SERVICE_INTERROGATE); if (!handle) - throw rdr::win32_error("unable to open the service", GetLastError()); + throw rdr::win32_error("Unable to open the service", GetLastError()); // - Get the service status SERVICE_STATUS status; if (!ControlService(handle, SERVICE_CONTROL_INTERROGATE, (SERVICE_STATUS*)&status)) - throw rdr::win32_error("unable to query the service", GetLastError()); + throw rdr::win32_error("Unable to query the service", GetLastError()); return status.dwCurrentState; } diff --git a/win/rfb_win32/SocketManager.cxx b/win/rfb_win32/SocketManager.cxx index b42c66cb..7f6d1773 100644 --- a/win/rfb_win32/SocketManager.cxx +++ b/win/rfb_win32/SocketManager.cxx @@ -203,7 +203,7 @@ void SocketManager::processEvent(HANDLE event) { ListenInfo li = listeners[event]; // Accept an incoming connection - vlog.debug("accepting incoming connection"); + vlog.debug("Accepting incoming connection"); // What kind of event is this? WSANETWORKEVENTS network_events; @@ -217,13 +217,13 @@ void SocketManager::processEvent(HANDLE event) { if (new_sock) addSocket(new_sock, li.server, false); } else if (network_events.lNetworkEvents & FD_CLOSE) { - vlog.info("deleting listening socket"); + vlog.info("Deleting listening socket"); remListener(li.sock); } else if (network_events.lNetworkEvents & FD_ADDRESS_LIST_CHANGE) { li.notifier->processAddressChange(); requestAddressChangeEvents(li.sock); } else { - vlog.error("unknown listener event: %lx", network_events.lNetworkEvents); + vlog.error("Unknown listener event: %lx", network_events.lNetworkEvents); } } else if (connections.count(event)) { ConnInfo ci = connections[event]; @@ -236,7 +236,7 @@ void SocketManager::processEvent(HANDLE event) { // Fetch why this event notification triggered if (WSAEnumNetworkEvents(ci.sock->getFd(), event, &network_events) == SOCKET_ERROR) - throw rdr::socket_error("unable to get WSAEnumNetworkEvents:%u", WSAGetLastError()); + throw rdr::socket_error("Unable to get WSAEnumNetworkEvents:%u", WSAGetLastError()); // Cancel event notification for this socket if (WSAEventSelect(ci.sock->getFd(), event, 0) == SOCKET_ERROR) diff --git a/win/rfb_win32/TrayIcon.h b/win/rfb_win32/TrayIcon.h index 61d2c9ac..b4e75ea5 100644 --- a/win/rfb_win32/TrayIcon.h +++ b/win/rfb_win32/TrayIcon.h @@ -18,7 +18,7 @@ // -=- CView.h -// An instance of the CView class is created for each VNC Viewer connection. +// An instance of the CView class is created for each VNC viewer connection. #ifndef __RFB_WIN32_TRAY_ICON_H__ #define __RFB_WIN32_TRAY_ICON_H__ diff --git a/win/rfb_win32/WMHooks.cxx b/win/rfb_win32/WMHooks.cxx index cb2e0275..e1840eef 100644 --- a/win/rfb_win32/WMHooks.cxx +++ b/win/rfb_win32/WMHooks.cxx @@ -136,14 +136,14 @@ static bool StartHookThread() { return true; if (hooksLibrary == nullptr) return false; - vlog.debug("creating thread"); + vlog.debug("Creating thread"); hook_mgr = new WMHooksThread(); hook_mgr->start(); while (hook_mgr->getThreadId() == (DWORD)-1) Sleep(0); - vlog.debug("installing hooks"); + vlog.debug("Installing hooks"); if (!WM_Hooks_Install(hook_mgr->getThreadId(), 0)) { - vlog.error("failed to initialise hooks"); + vlog.error("Failed to initialise hooks"); hook_mgr->stop(); delete hook_mgr; hook_mgr = nullptr; @@ -157,7 +157,7 @@ static void StopHookThread() { return; if (!hooks.empty()) return; - vlog.debug("closing thread"); + vlog.debug("Closing thread"); hook_mgr->stop(); delete hook_mgr; hook_mgr = nullptr; @@ -165,7 +165,7 @@ static void StopHookThread() { static bool AddHook(WMHooks* hook) { - vlog.debug("adding hook"); + vlog.debug("Adding hook"); os::AutoMutex a(&hook_mgr_lock); if (!StartHookThread()) return false; @@ -175,7 +175,7 @@ static bool AddHook(WMHooks* hook) { static bool RemHook(WMHooks* hook) { { - vlog.debug("removing hook"); + vlog.debug("Removing hook"); os::AutoMutex a(&hook_mgr_lock); hooks.remove(hook); } @@ -216,7 +216,7 @@ WMHooksThread::worker() { Region updates[2]; int activeRgn = 0; - vlog.debug("starting hook thread"); + vlog.debug("Starting hook thread"); thread_id = GetCurrentThreadId(); @@ -291,16 +291,16 @@ WMHooksThread::worker() { } } - vlog.debug("stopping hook thread - processed %d events", count); + vlog.debug("Stopping hook thread - processed %d events", count); WM_Hooks_Remove(getThreadId()); } void WMHooksThread::stop() { - vlog.debug("stopping WMHooks thread"); + vlog.debug("Stopping WMHooks thread"); active = false; PostThreadMessage(thread_id, WM_QUIT, 0, 0); - vlog.debug("waiting for WMHooks thread"); + vlog.debug("Waiting for WMHooks thread"); wait(); } diff --git a/win/vncconfig/Connections.h b/win/vncconfig/Connections.h index dfa5c79f..9ec78c07 100644 --- a/win/vncconfig/Connections.h +++ b/win/vncconfig/Connections.h @@ -89,7 +89,7 @@ namespace rfb { ConnectionsPage(const RegKey& rk) : PropSheetPage(GetModuleHandle(nullptr), MAKEINTRESOURCE(IDD_CONNECTIONS)), regKey(rk) {} void initDialog() override { - vlog.debug("set IDC_PORT %d", (int)port_number); + vlog.debug("Set IDC_PORT %d", (int)port_number); setItemInt(IDC_PORT, port_number ? port_number : 5900); setItemChecked(IDC_RFB_ENABLE, port_number != 0); setItemInt(IDC_IDLE_TIMEOUT, rfb::Server::idleTimeout); diff --git a/win/vncconfig/Legacy.cxx b/win/vncconfig/Legacy.cxx index c6b245cc..3280eaef 100644 --- a/win/vncconfig/Legacy.cxx +++ b/win/vncconfig/Legacy.cxx @@ -143,10 +143,10 @@ void LegacyPage::LoadPrefs() try { RegKey userKey; userKey.openKey(winvnc3, "Default"); - vlog.info("loading Default prefs"); + vlog.info("Loading default prefs"); LoadUserPrefs(userKey); } catch(std::exception& e) { - vlog.error("error reading Default settings:%s", e.what()); + vlog.error("Error reading Default settings:%s", e.what()); } // Open the local, user-specific settings @@ -154,10 +154,10 @@ void LegacyPage::LoadPrefs() try { RegKey userKey; userKey.openKey(winvnc3, username.c_str()); - vlog.info("loading local User prefs"); + vlog.info("Loading local user prefs"); LoadUserPrefs(userKey); } catch(std::exception& e) { - vlog.error("error reading local User settings:%s", e.what()); + vlog.error("Error reading local User settings:%s", e.what()); } // Open the user's own settings @@ -165,10 +165,10 @@ void LegacyPage::LoadPrefs() try { RegKey userKey; userKey.openKey(HKEY_CURRENT_USER, "Software\\ORL\\WinVNC3"); - vlog.info("loading global User prefs"); + vlog.info("Loading global user prefs"); LoadUserPrefs(userKey); } catch(std::exception& e) { - vlog.error("error reading global User settings:%s", e.what()); + vlog.error("Error reading global User settings:%s", e.what()); } } } diff --git a/win/vncconfig/vncconfig.cxx b/win/vncconfig/vncconfig.cxx index 7e692b9b..fffdea18 100644 --- a/win/vncconfig/vncconfig.cxx +++ b/win/vncconfig/vncconfig.cxx @@ -129,7 +129,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE /*prev*/, char* /*cmdLine*/, int /* // Something weird happens on NT 4.0 SP5 but I can't reproduce it on other // NT 4.0 service pack revisions. if (e.err == ERROR_INVALID_PARAMETER) { - MsgBox(nullptr, "Windows reported an error trying to secure the VNC Server settings for this user. " + MsgBox(nullptr, "Windows reported an error trying to secure the VNC server settings for this user. " "Your settings may not be secure!", MB_ICONWARNING | MB_OK); } else if (e.err != ERROR_CALL_NOT_IMPLEMENTED && e.err != ERROR_NOT_LOGGED_ON) { @@ -158,13 +158,13 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE /*prev*/, char* /*cmdLine*/, int /* HICON icon = (HICON)LoadImage(inst, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 0, 0, LR_SHARED); // Create the PropertySheet handler - const char* propSheetTitle = "VNC Server Properties (Service-Mode)"; + const char* propSheetTitle = "VNC server properties (service-mode)"; if (configKey == HKEY_CURRENT_USER) - propSheetTitle = "VNC Server Properties (User-Mode)"; + propSheetTitle = "VNC server properties (user-mode)"; PropSheet sheet(inst, propSheetTitle, pages, icon); #ifdef _DEBUG - vlog.debug("capture dialogs=%s", captureDialogs ? "true" : "false"); + vlog.debug("Capture dialogs=%s", captureDialogs ? "true" : "false"); sheet.showPropSheet(nullptr, true, false, captureDialogs); #else sheet.showPropSheet(nullptr, true, false); diff --git a/win/vncconfig/vncconfig.rc b/win/vncconfig/vncconfig.rc index 4eccc604..ca188bcf 100644 --- a/win/vncconfig/vncconfig.rc +++ b/win/vncconfig/vncconfig.rc @@ -110,7 +110,7 @@ BEGIN LTEXT "Disconnect idle clients after (seconds):",IDC_STATIC,7, 25,138,15,SS_CENTERIMAGE EDITTEXT IDC_IDLE_TIMEOUT,150,25,61,15,ES_AUTOHSCROLL | ES_NUMBER - GROUPBOX "Access Control",IDC_STATIC,7,55,204,135 + GROUPBOX "Access control",IDC_STATIC,7,55,204,135 CONTROL "Only accept connections from the local machine", IDC_LOCALHOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15, 70,190,15 @@ -125,7 +125,7 @@ END IDD_HOOKING DIALOG DISCARDABLE 0, 0, 197, 101 STYLE DS_MODALFRAME | DS_CONTROL | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Capture Method" +CAPTION "Capture method" FONT 8, "MS Sans Serif" BEGIN CONTROL "Poll for changes to the desktop",IDC_USEPOLLING,"Button", @@ -141,12 +141,12 @@ END IDD_AUTH_VNC_PASSWD DIALOG DISCARDABLE 0, 0, 212, 70 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "VNC Server Password" +CAPTION "VNC server password" FONT 8, "MS Sans Serif" BEGIN - LTEXT "New Password:",IDC_STATIC,7,10,63,15 + LTEXT "New password:",IDC_STATIC,7,10,63,15 EDITTEXT IDC_PASSWORD1,75,10,130,15,ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "Confirm Password:",IDC_STATIC,7,30,63,14 + LTEXT "Confirm password:",IDC_STATIC,7,30,63,14 EDITTEXT IDC_PASSWORD2,75,30,130,14,ES_PASSWORD | ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,100,50,50,15 PUSHBUTTON "Cancel",IDCANCEL,155,50,50,15 @@ -157,14 +157,14 @@ STYLE DS_MODALFRAME | DS_CONTROL | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Legacy" FONT 8, "MS Sans Serif" BEGIN - PUSHBUTTON "&Import VNC 3.3 Settings",IDC_LEGACY_IMPORT,7,10,92,20 + PUSHBUTTON "&Import VNC 3.3 settings",IDC_LEGACY_IMPORT,7,10,92,20 CONTROL "Only use protocol version 3.3",IDC_PROTOCOL_3_3,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,35,152,15 END IDD_CONN_HOST DIALOG DISCARDABLE 0, 0, 225, 57 STYLE DS_SYSMODAL | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION -CAPTION "Specify Host IP Address Pattern" +CAPTION "Specify host IP address pattern" FONT 8, "MS Sans Serif" BEGIN EDITTEXT IDC_HOST_PATTERN,65,5,100,15,ES_AUTOHSCROLL @@ -221,7 +221,7 @@ END IDD_ABOUT DIALOG DISCARDABLE 0, 0, 300, 92 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About TigerVNC Config for Windows" +CAPTION "About TigerVNC config for Windows" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,245,70,47,15 @@ -459,17 +459,17 @@ BEGIN BLOCK "080904b0" BEGIN VALUE "Comments", "\0" - VALUE "CompanyName", "TigerVNC Project\0" + VALUE "CompanyName", "TigerVNC project\0" #ifdef WIN64 - VALUE "FileDescription", "TigerVNC Server Configuration Applet for Win64\0" - VALUE "ProductName", "TigerVNC Server Configuration Applet for Win64\0" + VALUE "FileDescription", "TigerVNC server configuration applet for Win64\0" + VALUE "ProductName", "TigerVNC server configuration applet for Win64\0" #else - VALUE "FileDescription", "TigerVNC Server Configuration Applet for Win32\0" - VALUE "ProductName", "TigerVNC Server Configuration Applet for Win32\0" + VALUE "FileDescription", "TigerVNC server configuration applet for Win32\0" + VALUE "ProductName", "TigerVNC server configuration applet for Win32\0" #endif VALUE "FileVersion", __RCVERSIONSTR VALUE "InternalName", "vncconfig\0" - VALUE "LegalCopyright", "Copyright (C) 1999-2024 TigerVNC Team and many others (see README.rst)\0" + VALUE "LegalCopyright", "Copyright (C) 1999-2024 TigerVNC team and many others (see README.rst)\0" VALUE "LegalTrademarks", "TigerVNC\0" VALUE "OriginalFilename", "vncconfig.exe\0" VALUE "PrivateBuild", "\0" diff --git a/win/winvnc/ManagedListener.cxx b/win/winvnc/ManagedListener.cxx index 78f383a6..6690f364 100644 --- a/win/winvnc/ManagedListener.cxx +++ b/win/winvnc/ManagedListener.cxx @@ -48,7 +48,7 @@ ManagedListener::~ManagedListener() { void ManagedListener::setServer(rfb::VNCServer* svr) { if (svr == server) return; - vlog.info("set server to %p", svr); + vlog.info("Set server to %p", svr); server = svr; refresh(); } @@ -56,14 +56,14 @@ void ManagedListener::setServer(rfb::VNCServer* svr) { void ManagedListener::setPort(int port_, bool localOnly_) { if ((port_ == port) && (localOnly == localOnly_)) return; - vlog.info("set port to %d", port_); + vlog.info("Set port to %d", port_); port = port_; localOnly = localOnly_; refresh(); } void ManagedListener::setFilter(const char* filterStr) { - vlog.info("set filter to %s", filterStr); + vlog.info("Set filter to %s", filterStr); delete filter; filter = new network::TcpFilter(filterStr); if (!sockets.empty() && !localOnly) { diff --git a/win/winvnc/QueryConnectDialog.cxx b/win/winvnc/QueryConnectDialog.cxx index 1ef26e63..e1df584d 100644 --- a/win/winvnc/QueryConnectDialog.cxx +++ b/win/winvnc/QueryConnectDialog.cxx @@ -34,7 +34,7 @@ using namespace winvnc; static LogWriter vlog("QueryConnectDialog"); static IntParameter timeout("QueryConnectTimeout", - "Number of seconds to show the Accept Connection dialog before " + "Number of seconds to show the Accept connection dialog before " "rejecting the connection", 10); diff --git a/win/winvnc/STrayIcon.cxx b/win/winvnc/STrayIcon.cxx index 4420b574..b64634b3 100644 --- a/win/winvnc/STrayIcon.cxx +++ b/win/winvnc/STrayIcon.cxx @@ -47,8 +47,8 @@ using namespace winvnc; static LogWriter vlog("STrayIcon"); -BoolParameter STrayIconThread::disableOptions("DisableOptions", "Disable the Options entry in the VNC Server tray menu.", false); -BoolParameter STrayIconThread::disableClose("DisableClose", "Disable the Close entry in the VNC Server tray menu.", false); +BoolParameter STrayIconThread::disableOptions("DisableOptions", "Disable the Options entry in the VNC server tray menu.", false); +BoolParameter STrayIconThread::disableClose("DisableClose", "Disable the Close entry in the VNC server tray menu.", false); // diff --git a/win/winvnc/VNCServerWin32.cxx b/win/winvnc/VNCServerWin32.cxx index cea0fe78..ee6c60a7 100644 --- a/win/winvnc/VNCServerWin32.cxx +++ b/win/winvnc/VNCServerWin32.cxx @@ -112,9 +112,9 @@ void VNCServerWin32::processAddressChange() { return; // Tool-tip prefix depends on server mode - const char* prefix = "VNC Server (User):"; + const char* prefix = "VNC server (user):"; if (isServiceProcess()) - prefix = "VNC Server (Service):"; + prefix = "VNC server (service):"; // Fetch the list of addresses std::list<std::string> addrs; @@ -300,12 +300,12 @@ void VNCServerWin32::processEvent(HANDLE event_) { switch (command) { case DisconnectClients: - // Disconnect all currently active VNC Viewers + // Disconnect all currently active VNC viewers vncServer.closeClients((const char*)commandData); break; case AddClient: - // Make a reverse connection to a VNC Viewer + // Make a reverse connection to a VNC viewer sockMgr.addSocket((network::Socket*)commandData, &vncServer); break; case GetClientsInfo: @@ -327,7 +327,7 @@ void VNCServerWin32::processEvent(HANDLE event_) { break; default: - vlog.error("unknown command %d queued", command); + vlog.error("Unknown command %d queued", command); }; // Clear the command and signal completion diff --git a/win/winvnc/VNCServerWin32.h b/win/winvnc/VNCServerWin32.h index 493b3fa6..4fcc66d5 100644 --- a/win/winvnc/VNCServerWin32.h +++ b/win/winvnc/VNCServerWin32.h @@ -58,7 +58,7 @@ namespace winvnc { // THREAD-SAFE bool isServerInUse() const {return isDesktopStarted;} - // Connect out to the specified VNC Viewer + // Connect out to the specified VNC viewer // THREAD-SAFE bool addNewClient(const char* client); diff --git a/win/winvnc/winvnc.cxx b/win/winvnc/winvnc.cxx index 1a370522..299e1fa1 100644 --- a/win/winvnc/winvnc.cxx +++ b/win/winvnc/winvnc.cxx @@ -16,7 +16,7 @@ * USA. */ -// -=- VNC Server 4.0 for Windows (WinVNC4) +// -=- VNC server 4.0 for Windows (WinVNC4) #ifdef HAVE_CONFIG_H #include <config.h> @@ -155,7 +155,7 @@ static void processParams(int argc, char** argv) { runServer = false; std::string result; DWORD state = rfb::win32::getServiceState(VNCServerService::Name); - result = format("The %s Service is in the %s state.", + result = format("The %s service is in the %s state.", VNCServerService::Name, rfb::win32::serviceStateName(state)); MsgBoxOrLog(result.c_str()); @@ -199,9 +199,9 @@ static void processParams(int argc, char** argv) { } else if (strcasecmp(argv[i], "-noconsole") == 0) { close_console = true; - vlog.info("closing console"); + vlog.info("Closing console"); if (!FreeConsole()) - vlog.info("unable to close console:%lu", GetLastError()); + vlog.info("Unable to close console:%lu", GetLastError()); } else if ((strcasecmp(argv[i], "-help") == 0) || (strcasecmp(argv[i], "--help") == 0) || diff --git a/win/winvnc/winvnc.rc b/win/winvnc/winvnc.rc index 6fc65198..807114d0 100644 --- a/win/winvnc/winvnc.rc +++ b/win/winvnc/winvnc.rc @@ -76,9 +76,9 @@ BEGIN BLOCK "080904b0" BEGIN VALUE "Comments", "\0" - VALUE "CompanyName", "TigerVNC Project\0" - VALUE "FileDescription", "TigerVNC Server\0" - VALUE "ProductName", "TigerVNC Server\0" + VALUE "CompanyName", "TigerVNC project\0" + VALUE "FileDescription", "TigerVNC server\0" + VALUE "ProductName", "TigerVNC server\0" VALUE "FileVersion", __RCVERSIONSTR VALUE "InternalName", "winvnc\0" VALUE "LegalCopyright", "Copyright (C) 1999-2024 TigerVNC Team and many others (see README.rst)\0" @@ -119,14 +119,14 @@ IDR_TRAY MENU DISCARDABLE BEGIN POPUP "Tray Menu" BEGIN - MENUITEM "Control &Panel", ID_CONTR0L_PANEL + MENUITEM "Control &panel", ID_CONTR0L_PANEL MENUITEM SEPARATOR MENUITEM "&Options...", ID_OPTIONS - MENUITEM "Add &New Client...", ID_CONNECT - MENUITEM "&Disconnect Clients", ID_DISCONNECT - MENUITEM "D&isable New Clients", ID_DISABLE_NEW_CLIENTS + MENUITEM "Add &new client...", ID_CONNECT + MENUITEM "&Disconnect clients", ID_DISCONNECT + MENUITEM "D&isable new clients", ID_DISABLE_NEW_CLIENTS MENUITEM SEPARATOR - MENUITEM "&Close VNC Server", ID_CLOSE + MENUITEM "&Close VNC server", ID_CLOSE MENUITEM "&About...", ID_ABOUT END END @@ -140,7 +140,7 @@ END IDD_ABOUT DIALOG DISCARDABLE 0, 0, 300, 92 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About TigerVNC Server for Windows" +CAPTION "About TigerVNC server for Windows" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,245,70,47,15 @@ -156,7 +156,7 @@ END IDD_QUERY_CONNECT DIALOG DISCARDABLE 0, 0, 164, 93 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "VNC Server : Accept Connection?" +CAPTION "VNC server : Accept connection?" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "&Reject",IDCANCEL,105,72,52,14 @@ -173,7 +173,7 @@ END IDD_ADD_NEW_CLIENT DIALOG DISCARDABLE 0, 0, 177, 52 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "VNC Server : Add New Client" +CAPTION "VNC server : Add new client" FONT 8, "MS Sans Serif" BEGIN EDITTEXT IDC_HOST,80,10,90,15,ES_AUTOHSCROLL @@ -187,7 +187,7 @@ END IDD_CONTROL_PANEL DIALOG DISCARDABLE 0, 0, 267, 238 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | DS_CONTEXTHELP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Control Panel" +CAPTION "Control panel" FONT 8, "MS Sans Serif" BEGIN CONTROL "List1",IDC_LIST_CONNECTIONS,"SysListView32",LVS_REPORT | @@ -200,11 +200,11 @@ BEGIN PUSHBUTTON "View-only",IDC_VIEW_ONLY,13,121,111,14 PUSHBUTTON "Full control ",IDC_FULL_CONTROL,13,145,112,14 PUSHBUTTON "Stop updating",IDC_STOP_UPDATE,13,167,111,14 - PUSHBUTTON "Kill Clients",IDC_KILL_SEL_CLIENT,13,190,111,14 + PUSHBUTTON "Kill clients",IDC_KILL_SEL_CLIENT,13,190,111,14 PUSHBUTTON "Properties",IDC_PROPERTIES,144,121,111,14 - PUSHBUTTON "Add New Client",IDC_ADD_CLIENT,144,145,111,14 - PUSHBUTTON "Kill All Clients",IDC_KILL_ALL,144,167,111,14 - CONTROL "Disable New Clients",IDC_DISABLE_CLIENTS,"Button", + PUSHBUTTON "Add new client",IDC_ADD_CLIENT,144,145,111,14 + PUSHBUTTON "Kill all clients",IDC_KILL_ALL,144,167,111,14 + CONTROL "Disable new clients",IDC_DISABLE_CLIENTS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,144,191,111,13 PUSHBUTTON "Close",IDCANCEL,144,217,111,14 END diff --git a/win/wm_hooks/wm_hooks.rc b/win/wm_hooks/wm_hooks.rc index da7a9c45..ae56b314 100644 --- a/win/wm_hooks/wm_hooks.rc +++ b/win/wm_hooks/wm_hooks.rc @@ -72,9 +72,9 @@ BEGIN BLOCK "080904b0" BEGIN VALUE "Comments", "\0" - VALUE "CompanyName", "TigerVNC Project\0" - VALUE "FileDescription", "TigerVNC Server Hooking DLL\0" - VALUE "ProductName", "TigerVNC Server Hooking DLL\0" + VALUE "CompanyName", "TigerVNC project\0" + VALUE "FileDescription", "TigerVNC server hooking DLL\0" + VALUE "ProductName", "TigerVNC server hooking DLL\0" VALUE "FileVersion", __RCVERSIONSTR VALUE "InternalName", "\0" VALUE "LegalCopyright", "Copyright (C) 1999-2005 [many holders]\0" |