sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Console detection now works reliably when starting blender-app directly

Browse Source
This commit is contained in:
Sergey Sharybin 2014-08-12 16:40:23 +06:00
parent 1743c81ce1
commit 0fc4289c39
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
intern/ghost/intern/GHOST_SystemWin32.cpp
View File

@ -1408,19 +1408,41 @@ static DWORD GetParentProcessID(void)
return ppid;
}
static bool getProcessName(int pid, char *buffer, int max_len)
{
bool result = false;
HANDLE handle = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ,
FALSE, pid);
if (handle) {
GetModuleFileNameEx(handle, 0, buffer, max_len);
result = true;
}
CloseHandle(handle);
return result;
}
static bool isStartedFromCommandPrompt()
{
HWND hwnd = GetConsoleWindow();
if (hwnd) {
DWORD pid = (DWORD)-1;
DWORD ppid = GetParentProcessID();
char parent_name[MAX_PATH];
bool start_from_launcher = false;
GetWindowThreadProcessId(hwnd, &pid);
if (getProcessName(ppid, parent_name, sizeof(parent_name))) {
char *filename = strrchr(parent_name, '\\');
if (filename != NULL) {
start_from_launcher = strstr(filename, "blender.exe") != NULL;
}
}
/* Because we're starting from a wrapper we need to comare with
/* When we're starting from a wrapper we need to comare with
* parent process ID.
*/
if (pid == GetParentProcessID())
if (pid == (start_from_launcher ? ppid : GetCurrentProcessId()))
return true;
}