Tweaks to the recent wrapper on windows
- Forgot to handle command line arguments - Because of the fact we need to be able to use stdout and stderr we need to use regular console application for the wrapper. - Because of using regular application for the wrapper we need to check forparent PID in the isStartedFromCommandPrompt(). I really hope it's not gonna to become any more complicated.
This commit is contained in:
@@ -46,6 +46,7 @@
|
||||
|
||||
#include <shlobj.h>
|
||||
#include <tlhelp32.h>
|
||||
#include <Psapi.h>
|
||||
|
||||
#include "utfconv.h"
|
||||
|
||||
@@ -1383,6 +1384,30 @@ void GHOST_SystemWin32::putClipboard(GHOST_TInt8 *buffer, bool selection) const
|
||||
}
|
||||
}
|
||||
|
||||
static DWORD GetParentProcessID(void)
|
||||
{
|
||||
HANDLE snapshot;
|
||||
PROCESSENTRY32 pe32 = {0};
|
||||
DWORD ppid = 0, pid = GetCurrentProcessId();
|
||||
snapshot = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 );
|
||||
if (snapshot == INVALID_HANDLE_VALUE) {
|
||||
return -1;
|
||||
}
|
||||
pe32.dwSize = sizeof( pe32 );
|
||||
if (!Process32First(snapshot, &pe32)) {
|
||||
CloseHandle(snapshot);
|
||||
return -1;
|
||||
}
|
||||
do {
|
||||
if (pe32.th32ProcessID == pid) {
|
||||
ppid = pe32.th32ParentProcessID;
|
||||
break;
|
||||
}
|
||||
} while (Process32Next(snapshot, &pe32));
|
||||
CloseHandle(snapshot);
|
||||
return ppid;
|
||||
}
|
||||
|
||||
static bool isStartedFromCommandPrompt()
|
||||
{
|
||||
HWND hwnd = GetConsoleWindow();
|
||||
@@ -1392,7 +1417,10 @@ static bool isStartedFromCommandPrompt()
|
||||
|
||||
GetWindowThreadProcessId(hwnd, &pid);
|
||||
|
||||
if (pid == GetCurrentProcessId())
|
||||
/* Because we're starting from a wrapper we need to comare with
|
||||
* parent process ID.
|
||||
*/
|
||||
if (pid == GetParentProcessID())
|
||||
return true;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user