hammy
/
neovide
mirror of https://github.com/sgoudham/neovide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[windows] Right click menu setup with no Admin

Browse Source 
The old code was using HKEY_CLASSES_ROOT, which requires Admin.
Fixed to use HKEY_CURRENT_USER to works without Admin.

Reference: https://stackoverflow.com/a/29769228/13173256
macos-click-through
nganhkhoa 3 years ago committed by Keith Simmons
parent 3d4bd0e056
commit 551994c705
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File

8
src/bridge/ui_commands.rs
Unescape Escape View File

@ -143,17 +143,17 @@ impl ParallelCommand {
#[cfg(windows)] #[cfg(windows)]
ParallelCommand::RegisterRightClick => { ParallelCommand::RegisterRightClick => {
if unregister_rightclick() { if unregister_rightclick() {
let msg = "Could not unregister previous menu item. Possibly already registered or not running as Admin?"; let msg = "Could not unregister previous menu item. Possibly already registered.";
nvim.err_writeln(msg).await.ok(); nvim.err_writeln(msg).await.ok();
error!("{}", msg); error!("{}", msg);
} }
if !register_rightclick_directory() { if !register_rightclick_directory() {
let msg = "Could not register directory context menu item. Possibly already registered or not running as Admin?"; let msg = "Could not register directory context menu item. Possibly already registered.";
nvim.err_writeln(msg).await.ok(); nvim.err_writeln(msg).await.ok();
error!("{}", msg); error!("{}", msg);
} }
if !register_rightclick_file() { if !register_rightclick_file() {
let msg = "Could not register file context menu item. Possibly already registered or not running as Admin?"; let msg = "Could not register file context menu item. Possibly already registered.";
nvim.err_writeln(msg).await.ok(); nvim.err_writeln(msg).await.ok();
error!("{}", msg); error!("{}", msg);
} }
@ -161,7 +161,7 @@ impl ParallelCommand {
#[cfg(windows)] #[cfg(windows)]
ParallelCommand::UnregisterRightClick => { ParallelCommand::UnregisterRightClick => {
if !unregister_rightclick() { if !unregister_rightclick() {
let msg = "Could not remove context menu items. Possibly already removed or not running as Admin?"; let msg = "Could not remove context menu items. Possibly already removed.";
nvim.err_writeln(msg).await.ok(); nvim.err_writeln(msg).await.ok();
error!("{}", msg); error!("{}", msg);
} }

26
src/windows_utils.rs
Unescape Escape View File

@ -11,7 +11,7 @@ use winapi::{
libloaderapi::GetModuleFileNameA, libloaderapi::GetModuleFileNameA,
wincon::{AttachConsole, ATTACH_PARENT_PROCESS}, wincon::{AttachConsole, ATTACH_PARENT_PROCESS},
winnt::{KEY_WRITE, REG_OPTION_NON_VOLATILE, REG_SZ}, winnt::{KEY_WRITE, REG_OPTION_NON_VOLATILE, REG_SZ},
winreg::{RegCloseKey, RegCreateKeyExA, RegDeleteTreeA, RegSetValueExA, HKEY_CLASSES_ROOT}, winreg::{RegCloseKey, RegCreateKeyExA, RegDeleteTreeA, RegSetValueExA, HKEY_CURRENT_USER},
}, },
}; };
@ -34,11 +34,11 @@ fn get_binary_path() -> String {
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
pub fn unregister_rightclick() -> bool { pub fn unregister_rightclick() -> bool {
let str_registry_path_1 = CString::new("Directory\\Background\\shell\\Neovide").unwrap(); let str_registry_path_1 = CString::new("Software\\Classes\\Directory\\Background\\shell\\Neovide").unwrap();
let str_registry_path_2 = CString::new("*\\shell\\Neovide").unwrap(); let str_registry_path_2 = CString::new("Software\\Classes\\*\\shell\\Neovide").unwrap();
unsafe { unsafe {
let s1 = RegDeleteTreeA(HKEY_CLASSES_ROOT, str_registry_path_1.as_ptr()); let s1 = RegDeleteTreeA(HKEY_CURRENT_USER, str_registry_path_1.as_ptr());
let s2 = RegDeleteTreeA(HKEY_CLASSES_ROOT, str_registry_path_2.as_ptr()); let s2 = RegDeleteTreeA(HKEY_CURRENT_USER, str_registry_path_2.as_ptr());
s1 == 0 && s2 == 0 s1 == 0 && s2 == 0
} }
} }
@ -47,16 +47,16 @@ pub fn unregister_rightclick() -> bool {
pub fn register_rightclick_directory() -> bool { pub fn register_rightclick_directory() -> bool {
let neovide_path = get_binary_path(); let neovide_path = get_binary_path();
let mut registry_key: HKEY = null_mut(); let mut registry_key: HKEY = null_mut();
let str_registry_path = CString::new("Directory\\Background\\shell\\Neovide").unwrap(); let str_registry_path = CString::new("Software\\Classes\\Directory\\Background\\shell\\Neovide").unwrap();
let str_registry_command_path = let str_registry_command_path =
CString::new("Directory\\Background\\shell\\Neovide\\command").unwrap(); CString::new("Software\\Classes\\Directory\\Background\\shell\\Neovide\\command").unwrap();
let str_icon = CString::new("Icon").unwrap(); let str_icon = CString::new("Icon").unwrap();
let str_command = CString::new(format!("{} \"%V\"", neovide_path).as_bytes()).unwrap(); let str_command = CString::new(format!("{} \"%V\"", neovide_path).as_bytes()).unwrap();
let str_description = CString::new("Open with Neovide").unwrap(); let str_description = CString::new("Open with Neovide").unwrap();
let str_neovide_path = CString::new(neovide_path.as_bytes()).unwrap(); let str_neovide_path = CString::new(neovide_path.as_bytes()).unwrap();
unsafe { unsafe {
if RegCreateKeyExA( if RegCreateKeyExA(
HKEY_CLASSES_ROOT, HKEY_CURRENT_USER,
str_registry_path.as_ptr(), str_registry_path.as_ptr(),
0, 0,
null_mut(), null_mut(),
@ -97,7 +97,7 @@ pub fn register_rightclick_directory() -> bool {
RegCloseKey(registry_key); RegCloseKey(registry_key);
if RegCreateKeyExA( if RegCreateKeyExA(
HKEY_CLASSES_ROOT, HKEY_CURRENT_USER,
str_registry_command_path.as_ptr(), str_registry_command_path.as_ptr(),
0, 0,
null_mut(), null_mut(),
@ -135,15 +135,15 @@ pub fn register_rightclick_directory() -> bool {
pub fn register_rightclick_file() -> bool { pub fn register_rightclick_file() -> bool {
let neovide_path = get_binary_path(); let neovide_path = get_binary_path();
let mut registry_key: HKEY = null_mut(); let mut registry_key: HKEY = null_mut();
let str_registry_path = CString::new("*\\shell\\Neovide").unwrap(); let str_registry_path = CString::new("Software\\Classes\\*\\shell\\Neovide").unwrap();
let str_registry_command_path = CString::new("*\\shell\\Neovide\\command").unwrap(); let str_registry_command_path = CString::new("Software\\Classes\\*\\shell\\Neovide\\command").unwrap();
let str_icon = CString::new("Icon").unwrap(); let str_icon = CString::new("Icon").unwrap();
let str_command = CString::new(format!("{} \"%1\"", neovide_path).as_bytes()).unwrap(); let str_command = CString::new(format!("{} \"%1\"", neovide_path).as_bytes()).unwrap();
let str_description = CString::new("Open with Neovide").unwrap(); let str_description = CString::new("Open with Neovide").unwrap();
let str_neovide_path = CString::new(neovide_path.as_bytes()).unwrap(); let str_neovide_path = CString::new(neovide_path.as_bytes()).unwrap();
unsafe { unsafe {
if RegCreateKeyExA( if RegCreateKeyExA(
HKEY_CLASSES_ROOT, HKEY_CURRENT_USER,
str_registry_path.as_ptr(), str_registry_path.as_ptr(),
0, 0,
null_mut(), null_mut(),
@ -184,7 +184,7 @@ pub fn register_rightclick_file() -> bool {
RegCloseKey(registry_key); RegCloseKey(registry_key);
if RegCreateKeyExA( if RegCreateKeyExA(
HKEY_CLASSES_ROOT, HKEY_CURRENT_USER,
str_registry_command_path.as_ptr(), str_registry_command_path.as_ptr(),
0, 0,
null_mut(), null_mut(),

Write Preview
Loading…
Cancel
Save