UTF-8 file + update

DSMPlugin/MSRC4Plugin/MSRC4Plugin.cpp

@@ -221,7 +221,7 @@ PLUGIN_API int Shutdown(void)
 		CryptDestroyKey(hExchangeKey2);
     }
 
-	//We�re finished using the CSP handle, so we must release it.
+	//We're finished using the CSP handle, so we must release it.
 	if (hProvider) {
 		CryptReleaseContext(hProvider, 0);
 		CryptReleaseContext(hProvider2, 0);

DSMPlugin/MSRC4Plugin/MSRC4Plugin.rc

@@ -13,12 +13,12 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// Neutral resources
 
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
 #ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(65001)
 #endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
@@ -107,13 +107,13 @@ END
 
 3 TEXTINCLUDE 
 BEGIN
-    "#include ""version.rc""\r\n"
+    "#include ""version.rc2""\r\n"
     "\0"
 END
 
 #endif    // APSTUDIO_INVOKED
 
-#endif    // English (U.S.) resources
+#endif    // Neutral resources
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -123,7 +123,7 @@ END
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-#include "version.rc"
+#include "version.rc2"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED

DSMPlugin/MSRC4Plugin/crypto.cpp

@@ -251,7 +251,7 @@ BOOL GenKey(char * sDefaultGenKey, DWORD keyLen)
 	CryptDestroyKey(hGKey);
 	CryptDestroyKey(hGExchangeKey);
 
-	// We�re finished using the CSP handle, so we must release it. We close the input and output files, and we�re finished.
+	// We're finished using the CSP handle, so we must release it. We close the input and output files, and we're finished.
 	CryptReleaseContext(hGProvider, 0);
 
     CloseHandle(hGKeyFile);

DSMPlugin/MSRC4Plugin/crypto.rc

@@ -13,12 +13,12 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// Neutral resources
 
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
 #ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(65001)
 #endif //_WIN32
 
 #ifndef _MAC
@@ -44,18 +44,20 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "Comments", "crypto test utility\0"
-            VALUE "CompanyName", "Sean E. Covel\0"
-            VALUE "FileDescription", "crypto.exe\0"
+            VALUE "Comments", "UltraVNC crypto test utility\0"
+            VALUE "CompanyName", "uvnc bv\0"
+            VALUE "FileDescription", "UltraVNC crypto.exe\0"
             VALUE "FileVersion", "1, 1, 9, 0\0"
             VALUE "InternalName", "crypto.exe\0"
-            VALUE "LegalCopyright", "Copyright � 2002-2025 UltraVNC Team Members. All Rights Reserved.\0"
+            VALUE "LegalCopyright", "Copyright © 2002-2025 UltraVNC Team Members. All Rights Reserved.\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "crypto.exe\0"
             VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "crypto.exe\0"
+            VALUE "ProductName", "UltraVNC Crypto\0"
             VALUE "ProductVersion", "1, 1, 9, 0\0"
+#if isRC == 1
             VALUE "SpecialBuild", "\0"
+#endif
         END
     END
     BLOCK "VarFileInfo"
@@ -92,7 +94,7 @@ END
 
 #endif    // APSTUDIO_INVOKED
 
-#endif    // English (U.S.) resources
+#endif    // Neutral resources
 /////////////////////////////////////////////////////////////////////////////
 
 

DSMPlugin/MSRC4Plugin/main.cpp

@@ -345,13 +345,13 @@ if(!CryptSetKeyParam(hKey, KP_SALT, pbIV, 0)) {
                          NULL);
           } while (!finished);
 
-   //And we�re finished
-   //almost. All we need to do now is clean up. We�re finished with both keys at this point, so let�s delete them.
+   //And we're finished
+   //almost. All we need to do now is clean up. We're finished with both keys at this point, so let's delete them.
 
    // Clean up: release handles, close files.
 	CleanupCryptoKey(hExchangeKey);
     CleanupCryptoKey(hKey);
-   //We�re finished using the CSP handle, so we must release it. We close the input and output files, and we�re finished.
+   //We're finished using the CSP handle, so we must release it. We close the input and output files, and we're finished.
 
    CleanupCryptoContext(hProvider);
    CloseHandle(hInFile);
@@ -407,7 +407,7 @@ if(!CryptSetKeyParam(hKey, KP_SALT, pbIV, 0)) {
     return 1;
 }
 
-//Next, we read encrypted data in, decrypt it using CryptDecrypt, and write the decrypted data to our output file. Like the CryptEncrypt function, CryptDecrypt takes a �finished� Boolean flag to tell it when we�re sending it the last buffer to decrypt.
+//Next, we read encrypted data in, decrypt it using CryptDecrypt, and write the decrypted data to our output file. Like the CryptEncrypt function, CryptDecrypt takes a “finished” Boolean flag to tell it when we're sending it the last buffer to decrypt.
 
      // Read data in, encrypt it, and write encrypted data to output file.
      do 
@@ -417,7 +417,7 @@ if(!CryptSetKeyParam(hKey, KP_SALT, pbIV, 0)) {
           CryptDecrypt(hKey, 0, finished, 0, pbBuffer, &dwByteCount);
           WriteFile(hOutFile, pbBuffer,dwByteCount,&dwBytesWritten,NULL);
      } while (!finished);
-//We�re finished, so we now delete our key, release the CSP handle, and close the input and output files.
+//We're finished, so we now delete our key, release the CSP handle, and close the input and output files.
 
      // Clean up: release handles, close files.
 	 CleanupCryptoKey(hExchangeKey);

DSMPlugin/MSRC4Plugin/version.rc → DSMPlugin/MSRC4Plugin/version.rc2

@@ -1,46 +1,49 @@
-#ifndef _MAC
-
-#include "version.h"
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION MAJOR_INT,MINOR_INT,BUILD_INT,SPECIAL_INT
- PRODUCTVERSION MAJOR_INT,MINOR_INT,BUILD_INT,SPECIAL_INT
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "MS Encryption Plugin using RC4 encryption from the Microsoft RSA provider.\r\nDeveloped by Sean E. Covel and Released under the GPL 2.0.\0"
-            VALUE "CompanyName", "Sean E. Covel\0"
-            VALUE "FileDescription", PLUGIN_NAME BUILD_NUMBER 
-            VALUE "FileVersion", BUILD_NUMBER
-            VALUE "InternalName", PLUGIN_NAME
-            VALUE "LegalCopyright", "Copyright © 2002-2025 UltraVNC Team Members. All Rights Reserved.\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", DSM_NAME
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", PLUGIN_NAME BUILD_NUMBER 
-            VALUE "ProductVersion", BUILD_NUMBER
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
+#ifndef _MAC
+
+#include "version.h"
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION MAJOR_INT,MINOR_INT,BUILD_INT,SPECIAL_INT
+ PRODUCTVERSION MAJOR_INT,MINOR_INT,BUILD_INT,SPECIAL_INT
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "UltraVNC MS Encryption Plugin using RC4 encryption from the Microsoft RSA provider.\0"
+            VALUE "CompanyName", "uvnc bv\0"
+            VALUE "FileDescription", PLUGIN_NAME BUILD_NUMBER 
+            VALUE "FileVersion", BUILD_NUMBER
+            VALUE "InternalName", PLUGIN_NAME
+            VALUE "LegalCopyright", "Copyright © 2002-2025 UltraVNC Team Members. All Rights Reserved.\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", DSM_NAME
+            VALUE "PrivateBuild", "\0"
+            VALUE "ProductName", PLUGIN_NAME BUILD_NUMBER 
+            VALUE "ProductVersion", BUILD_NUMBER
+#if isRC == 1
+            VALUE "SpecialBuild", "\0"
+#endif
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // !_MAC
+

DSMPlugin/TestPlugin/TestPlugin.rc

@@ -5,12 +5,12 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// French (France) resources
+// Neutral resources
 
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
 #ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(65001)
 #endif //_WIN32
 
 #ifdef APSTUDIO_INVOKED
@@ -78,7 +78,7 @@ BEGIN
 END
 #endif    // APSTUDIO_INVOKED
 
-#endif    // French (France) resources
+#endif    // Neutral resources
 /////////////////////////////////////////////////////////////////////////////
 
 

UltraVNC-QtCommunityTests.files

@@ -27,7 +27,7 @@ DSMPlugin/MSRC4Plugin/resource.h
 DSMPlugin/MSRC4Plugin/utils.cpp
 DSMPlugin/MSRC4Plugin/utils.h
 DSMPlugin/MSRC4Plugin/version.h
-DSMPlugin/MSRC4Plugin/version.rc
+DSMPlugin/MSRC4Plugin/version.rc2
 DSMPlugin/TestPlugin/ReadMe.txt
 DSMPlugin/TestPlugin/StdAfx.cpp
 DSMPlugin/TestPlugin/StdAfx.h
@@ -357,7 +357,6 @@ repeater/repeater.h
 repeater/repeater.sln
 repeater/repeater.vcxproj
 repeater/resource.h
-repeater/resources.h
 repeater/resources.rc
 repeater/socket_functions.cpp
 repeater/webgui/README.txt

UltraVNC-QtCommunityTests.pro

@@ -85,7 +85,7 @@ CONFIG += embed_translations
 RESOURCES += \
     DSMPlugin/MSRC4Plugin/crypto.rc \
     DSMPlugin/MSRC4Plugin/MSRC4Plugin.rc \
-    DSMPlugin/MSRC4Plugin/version.rc \
+    DSMPlugin/MSRC4Plugin/version.rc2 \
     DSMPlugin/TestPlugin/TestPlugin.rc \
     JavaViewer/mk.bat \
     JavaViewer/run.bat \

UltraVNC_installer_x64.iss

@@ -268,7 +268,7 @@ Name: "{userdesktop}\UltraVNC Viewer"; Filename: "{app}\vncviewer.exe"; IconInde
 Name: "{userdesktop}\UltraVNC Launcher"; Filename: "{app}\UVNC_Launch.exe"; MinVersion: 0,6.0; Components: UltraVNC_Viewer; Tasks: desktopicon
 
 Name: "{group}\UltraVNC Repeater"; Filename: "{app}\repeater.exe"; WorkingDir: "{app}"; IconIndex: 0; Components: UltraVNC_Repeater
-Name: "{group}\UltraVNC Server"; Filename: "{app}\WinVNC.exe"; WorkingDir: "{app}"; IconIndex: 0; Components: UltraVNC_Server
+Name: "{group}\UltraVNC Server"; Filename: "{app}\winvnc.exe"; WorkingDir: "{app}"; IconIndex: 0; Components: UltraVNC_Server
 Name: "{group}\UltraVNC Viewer"; Filename: "{app}\vncviewer.exe"; WorkingDir: "{app}"; IconIndex: 0; Components: UltraVNC_Viewer
 Name: "{group}\UltraVNC Launcher"; Filename: "{app}\UVNC_Launch.exe"; WorkingDir: "{app}"; MinVersion: 0,6.0; Components: UltraVNC_Viewer
 
@@ -290,7 +290,7 @@ Filename: "certutil.exe"; Parameters: "-delstore trustedpublisher 01302f6c9f56b5
 Filename: "{app}\setpasswd.exe"; Parameters: "{param:setpasswd|}"; Flags: runhidden; Components: UltraVNC_Server
 Filename: "{app}\setcad.exe"; Flags: runhidden; Components: UltraVNC_Server
 Filename: "{app}\winvnc.exe"; Flags: nowait postinstall skipifsilent; Description: "{cm:LaunchProgram,{#MyAppName}}"; Components: UltraVNC_Server ; Tasks: not installservice
-Filename: "{app}\WinVNC.exe"; Parameters: "-install"; Flags: runhidden; StatusMsg: "{cm:Registering, UltraVNC}"; Components: UltraVNC_Server ; Tasks: installservice
+Filename: "{app}\winvnc.exe"; Parameters: "-install"; Flags: runhidden; StatusMsg: "{cm:Registering, UltraVNC}"; Components: UltraVNC_Server ; Tasks: installservice
 Filename: "net"; Parameters: "start uvnc_service"; Flags: runhidden; StatusMsg: "{cm:Starting,UltraVNC}"; Components: UltraVNC_Server ; Tasks: startservice
 Filename: "{syswow64}\netsh"; Parameters: "firewall add portopening TCP 5900 vnc5900"; Flags: runhidden; StatusMsg: "{cm:firewall}"; MinVersion: 0,5.01; Components: UltraVNC_Server
 Filename: "{syswow64}\netsh"; Parameters: "firewall add portopening TCP 5800 vnc5800"; Flags: runhidden; StatusMsg: "{cm:firewall}"; MinVersion: 0,5.01; Components: UltraVNC_Server
@@ -303,7 +303,7 @@ Filename: "pnputil.exe"; Parameters: "/delete-driver ""{app}\UVncVirtualDisplay6
 Filename: "pnputil.exe"; Parameters: "/delete-driver ""{app}\UVncVirtualDisplay\UVncVirtualDisplay.inf"" /uninstall"; WorkingDir: "{app}\UVncVirtualDisplay"; Flags: 64bit runhidden; StatusMsg: "{cm:UninstallingVirtualDriver}"
 Filename: "certutil.exe"; Parameters: "-delstore trustedpublisher 01302f6c9f56b5a7b00d148510a5a59e"; Flags: runhidden; StatusMsg: "{cm:RemovingTrustedPublisher}"
 Filename: "net"; Parameters: "stop uvnc_service"; Flags: runhidden; StatusMsg: "{cm:Stopping, UltraVNC}"; RunOnceId: "StopVncService"; Components: UltraVNC_Server
-Filename: "{app}\WinVNC.exe"; Parameters: "-uninstall"; Flags: runhidden; StatusMsg: "{cm:Removing,UltraVNC}"; RunOnceId: "RemoveVncService"; Components: UltraVNC_Server
+Filename: "{app}\winvnc.exe"; Parameters: "-uninstall"; Flags: runhidden; StatusMsg: "{cm:Removing,UltraVNC}"; RunOnceId: "RemoveVncService"; Components: UltraVNC_Server
 Filename: "{syswow64}\netsh"; Parameters: "firewall delete portopening TCP 5900 vnc5900"; Flags: runhidden; StatusMsg: "{cm:firewall}"; MinVersion: 0,5.01; Components: UltraVNC_Server
 Filename: "{syswow64}\netsh"; Parameters: "firewall delete portopening TCP 5800 vnc5800"; Flags: runhidden; StatusMsg: "{cm:firewall}"; MinVersion: 0,5.01; Components: UltraVNC_Server
 Filename: "{syswow64}\netsh"; Parameters: "firewall delete allowedprogram program=""{app}\vncviewer.exe"""; Flags: runhidden; StatusMsg: "{cm:firewall}"; MinVersion: 0,5.01; Components: UltraVNC_Viewer

UltraVNC_installer_x86.iss

@@ -266,7 +266,7 @@ Name: "{userdesktop}\UltraVNC Viewer"; Filename: "{app}\vncviewer.exe"; IconInde
 Name: "{userdesktop}\UltraVNC Launcher"; Filename: "{app}\UVNC_Launch.exe"; MinVersion: 0,6.0; Components: UltraVNC_Viewer; Tasks: desktopicon
 
 Name: "{group}\UltraVNC Repeater"; Filename: "{app}\repeater.exe"; WorkingDir: "{app}"; IconIndex: 0; Components: UltraVNC_Repeater
-Name: "{group}\UltraVNC Server"; Filename: "{app}\WinVNC.exe"; WorkingDir: "{app}"; IconIndex: 0; Components: UltraVNC_Server
+Name: "{group}\UltraVNC Server"; Filename: "{app}\winvnc.exe"; WorkingDir: "{app}"; IconIndex: 0; Components: UltraVNC_Server
 Name: "{group}\UltraVNC Viewer"; Filename: "{app}\vncviewer.exe"; WorkingDir: "{app}"; IconIndex: 0; Components: UltraVNC_Viewer
 Name: "{group}\UltraVNC Launcher"; Filename: "{app}\UVNC_Launch.exe"; WorkingDir: "{app}"; MinVersion: 0,6.0; Components: UltraVNC_Viewer
 
@@ -288,7 +288,7 @@ Filename: "certutil.exe"; Parameters: "-delstore trustedpublisher 01302f6c9f56b5
 Filename: "{app}\setpasswd.exe"; Parameters: "{param:setpasswd|}"; Flags: runhidden; Components: UltraVNC_Server
 Filename: "{app}\setcad.exe"; Flags: runhidden; Components: UltraVNC_Server
 Filename: "{app}\winvnc.exe"; Flags: nowait postinstall skipifsilent; Description: "{cm:LaunchProgram,{#MyAppName}}"; Components: UltraVNC_Server ; Tasks: not installservice
-Filename: "{app}\WinVNC.exe"; Parameters: "-install"; Flags: runhidden; StatusMsg: "{cm:Registering, UltraVNC}"; Components: UltraVNC_Server ; Tasks: installservice
+Filename: "{app}\winvnc.exe"; Parameters: "-install"; Flags: runhidden; StatusMsg: "{cm:Registering, UltraVNC}"; Components: UltraVNC_Server ; Tasks: installservice
 Filename: "net"; Parameters: "start uvnc_service"; Flags: runhidden; StatusMsg: "{cm:Starting,UltraVNC}"; Components: UltraVNC_Server ; Tasks: startservice
 Filename: "{sys}\netsh"; Parameters: "firewall add portopening TCP 5900 vnc5900"; Flags: runhidden; StatusMsg: "{cm:firewall}"; MinVersion: 0,5.01; Components: UltraVNC_Server
 Filename: "{sys}\netsh"; Parameters: "firewall add portopening TCP 5800 vnc5800"; Flags: runhidden; StatusMsg: "{cm:firewall}"; MinVersion: 0,5.01; Components: UltraVNC_Server
@@ -300,7 +300,7 @@ Filename: "https://uvnc.com/downloads/ultravnc.html"; Flags: nowait postinstall
 Filename: "pnputil.exe"; Parameters: "/delete-driver ""{app}\UVncVirtualDisplay\UVncVirtualDisplay.inf"" /uninstall"; WorkingDir: "{app}\UVncVirtualDisplay"; Flags: runhidden; StatusMsg: "{cm:UninstallingVirtualDriver}"
 Filename: "certutil.exe"; Parameters: "-delstore trustedpublisher 01302f6c9f56b5a7b00d148510a5a59e"; Flags: runhidden; StatusMsg: "{cm:RemovingTrustedPublisher}"
 Filename: "net"; Parameters: "stop uvnc_service"; Flags: runhidden; StatusMsg: "{cm:Stopping, UltraVNC}"; RunOnceId: "StopVncService"; Components: UltraVNC_Server
-Filename: "{app}\WinVNC.exe"; Parameters: "-uninstall"; Flags: runhidden; StatusMsg: "{cm:Removing,UltraVNC}"; RunOnceId: "RemoveVncService"; Components: UltraVNC_Server
+Filename: "{app}\winvnc.exe"; Parameters: "-uninstall"; Flags: runhidden; StatusMsg: "{cm:Removing,UltraVNC}"; RunOnceId: "RemoveVncService"; Components: UltraVNC_Server
 Filename: "{sys}\netsh"; Parameters: "firewall delete portopening TCP 5900 vnc5900"; Flags: runhidden; StatusMsg: "{cm:firewall}"; MinVersion: 0,5.01; Components: UltraVNC_Server
 Filename: "{sys}\netsh"; Parameters: "firewall delete portopening TCP 5800 vnc5800"; Flags: runhidden; StatusMsg: "{cm:firewall}"; MinVersion: 0,5.01; Components: UltraVNC_Server
 Filename: "{sys}\netsh"; Parameters: "firewall delete allowedprogram program=""{app}\vncviewer.exe"""; Flags: runhidden; StatusMsg: "{cm:firewall}"; MinVersion: 0,5.01; Components: UltraVNC_Viewer