diff --git a/Greenshot/Forms/MainForm.cs b/Greenshot/Forms/MainForm.cs index 03a32090a..13d90cfd4 100644 --- a/Greenshot/Forms/MainForm.cs +++ b/Greenshot/Forms/MainForm.cs @@ -215,7 +215,23 @@ namespace Greenshot { if (filesToOpen.Count > 0) { SendData(transport); } else { - MessageBox.Show(Language.GetString(LangKey.error_multipleinstances), Language.GetString(LangKey.error)); + StringBuilder instanceInfo = new StringBuilder(); + bool matchedThisProcess = false; + int index = 1; + foreach (Process greenshotProcess in Process.GetProcessesByName("greenshot")) { + try { + instanceInfo.Append(index++ + ": ").AppendLine(Kernel32.GetProcessPath(new IntPtr(greenshotProcess.Id))); + if (Process.GetCurrentProcess().Id == greenshotProcess.Id) { + matchedThisProcess = true; + } + } catch (Exception ex) { + LOG.Debug(ex); + } + } + if (!matchedThisProcess) { + instanceInfo.Append(index++ + ": ").AppendLine(Kernel32.GetProcessPath(new IntPtr(Process.GetCurrentProcess().Id))); + } + MessageBox.Show(Language.GetString(LangKey.error_multipleinstances) + "\r\n" + instanceInfo.ToString(), Language.GetString(LangKey.error)); } FreeMutex(); Application.Exit(); diff --git a/Greenshot/Helpers/ClipboardHelper.cs b/Greenshot/Helpers/ClipboardHelper.cs index cef5f3b2c..831800187 100644 --- a/Greenshot/Helpers/ClipboardHelper.cs +++ b/Greenshot/Helpers/ClipboardHelper.cs @@ -92,10 +92,10 @@ EndSelection:<<<<<<<4 try { IntPtr hWnd = User32.GetClipboardOwner(); if (hWnd != IntPtr.Zero) { - uint pid = 0; - uint tid = User32.GetWindowThreadProcessId( hWnd, out pid ); + IntPtr pid = IntPtr.Zero; + IntPtr tid = User32.GetWindowThreadProcessId( hWnd, out pid); Process me = Process.GetCurrentProcess(); - Process ownerProcess = Process.GetProcessById( (int)pid ); + Process ownerProcess = Process.GetProcessById( pid.ToInt32() ); // Exclude myself if (ownerProcess != null && me.Id != ownerProcess.Id) { // Get Process Name diff --git a/GreenshotPlugin/Core/WindowsHelper.cs b/GreenshotPlugin/Core/WindowsHelper.cs index af0b065bf..7241212a2 100644 --- a/GreenshotPlugin/Core/WindowsHelper.cs +++ b/GreenshotPlugin/Core/WindowsHelper.cs @@ -236,51 +236,10 @@ namespace GreenshotPlugin.Core { // not a valid window handle return string.Empty; } - StringBuilder _PathBuffer = new StringBuilder(512); // Get the process id - uint processid; + IntPtr processid; User32.GetWindowThreadProcessId(Handle, out processid); - - // Try the GetModuleFileName method first since it's the fastest. - // May return ACCESS_DENIED (due to VM_READ flag) if the process is not owned by the current user. - // Will fail if we are compiled as x86 and we're trying to open a 64 bit process...not allowed. - IntPtr hprocess = Kernel32.OpenProcess(ProcessAccessFlags.QueryInformation | ProcessAccessFlags.VMRead, false, processid); - if (hprocess != IntPtr.Zero) { - try { - if (Kernel32.GetModuleFileNameEx(hprocess, IntPtr.Zero, _PathBuffer, (uint)_PathBuffer.Capacity) > 0) { - return _PathBuffer.ToString(); - } - } finally { - Kernel32.CloseHandle(hprocess); - } - } - - hprocess = Kernel32.OpenProcess(ProcessAccessFlags.QueryInformation, false, processid); - if (hprocess != IntPtr.Zero) { - try { - // Try this method for Vista or higher operating systems - uint size = (uint)_PathBuffer.Capacity; - if ((Environment.OSVersion.Version.Major >= 6) && (Kernel32.QueryFullProcessImageName(hprocess, 0, _PathBuffer, ref size) && (size > 0))) { - return _PathBuffer.ToString(); - } - - // Try the GetProcessImageFileName method - if (Kernel32.GetProcessImageFileName(hprocess, _PathBuffer, (uint)_PathBuffer.Capacity) > 0) { - string dospath = _PathBuffer.ToString(); - foreach (string drive in Environment.GetLogicalDrives()) { - if (Kernel32.QueryDosDevice(drive.TrimEnd('\\'), _PathBuffer, (uint)_PathBuffer.Capacity) > 0) { - if (dospath.StartsWith(_PathBuffer.ToString())) { - return drive + dospath.Remove(0, _PathBuffer.Length); - } - } - } - } - } finally { - Kernel32.CloseHandle(hprocess); - } - } - - return string.Empty; + return Kernel32.GetProcessPath(processid); } } diff --git a/GreenshotPlugin/UnmanagedHelpers/Kernel32.cs b/GreenshotPlugin/UnmanagedHelpers/Kernel32.cs index 0b0351209..83e05503e 100644 --- a/GreenshotPlugin/UnmanagedHelpers/Kernel32.cs +++ b/GreenshotPlugin/UnmanagedHelpers/Kernel32.cs @@ -56,7 +56,7 @@ namespace GreenshotPlugin.UnmanagedHelpers { [DllImport("kernel32", SetLastError = true)] public static extern int ResumeThread(IntPtr hThread); [DllImport("kernel32", SetLastError = true)] - public static extern IntPtr OpenProcess(ProcessAccessFlags dwDesiredAccess, bool bInheritHandle, uint dwProcessId); + public static extern IntPtr OpenProcess(ProcessAccessFlags dwDesiredAccess, bool bInheritHandle, IntPtr dwProcessId); [DllImport("kernel32", SetLastError = true)] public static extern bool QueryFullProcessImageName(IntPtr hProcess, uint dwFlags, StringBuilder lpExeName, ref uint lpdwSize); [DllImport("kernel32", SetLastError = true)] @@ -71,6 +71,54 @@ namespace GreenshotPlugin.UnmanagedHelpers { public static extern uint GetModuleFileNameEx(IntPtr hProcess, IntPtr hModule, StringBuilder lpFilename, uint nSize); [DllImport("psapi", SetLastError = true)] public static extern uint GetProcessImageFileName(IntPtr hProcess, StringBuilder lpImageFileName, uint nSize); - + + /// + /// Method to get the process path + /// + /// + /// + public static string GetProcessPath(IntPtr processid) { + StringBuilder _PathBuffer = new StringBuilder(512); + // Try the GetModuleFileName method first since it's the fastest. + // May return ACCESS_DENIED (due to VM_READ flag) if the process is not owned by the current user. + // Will fail if we are compiled as x86 and we're trying to open a 64 bit process...not allowed. + IntPtr hprocess = Kernel32.OpenProcess(ProcessAccessFlags.QueryInformation | ProcessAccessFlags.VMRead, false, processid); + if (hprocess != IntPtr.Zero) { + try { + if (Kernel32.GetModuleFileNameEx(hprocess, IntPtr.Zero, _PathBuffer, (uint)_PathBuffer.Capacity) > 0) { + return _PathBuffer.ToString(); + } + } finally { + Kernel32.CloseHandle(hprocess); + } + } + + hprocess = Kernel32.OpenProcess(ProcessAccessFlags.QueryInformation, false, processid); + if (hprocess != IntPtr.Zero) { + try { + // Try this method for Vista or higher operating systems + uint size = (uint)_PathBuffer.Capacity; + if ((Environment.OSVersion.Version.Major >= 6) && (Kernel32.QueryFullProcessImageName(hprocess, 0, _PathBuffer, ref size) && (size > 0))) { + return _PathBuffer.ToString(); + } + + // Try the GetProcessImageFileName method + if (Kernel32.GetProcessImageFileName(hprocess, _PathBuffer, (uint)_PathBuffer.Capacity) > 0) { + string dospath = _PathBuffer.ToString(); + foreach (string drive in Environment.GetLogicalDrives()) { + if (Kernel32.QueryDosDevice(drive.TrimEnd('\\'), _PathBuffer, (uint)_PathBuffer.Capacity) > 0) { + if (dospath.StartsWith(_PathBuffer.ToString())) { + return drive + dospath.Remove(0, _PathBuffer.Length); + } + } + } + } + } finally { + Kernel32.CloseHandle(hprocess); + } + } + + return string.Empty; + } } } diff --git a/GreenshotPlugin/UnmanagedHelpers/User32.cs b/GreenshotPlugin/UnmanagedHelpers/User32.cs index 60fed8861..e82a53e1b 100644 --- a/GreenshotPlugin/UnmanagedHelpers/User32.cs +++ b/GreenshotPlugin/UnmanagedHelpers/User32.cs @@ -395,9 +395,6 @@ namespace GreenshotPlugin.UnmanagedHelpers { public static extern IntPtr SetClipboardViewer(IntPtr hWndNewViewer); [DllImport("user32", SetLastError = true, CharSet = CharSet.Auto)] public static extern bool ChangeClipboardChain(IntPtr hWndRemove, IntPtr hWndNewNext); - - [DllImport("user32", SetLastError = true)] - public static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId); /// uiFlags: 0 - Count of GDI objects /// uiFlags: 1 - Count of USER objects