hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-24 08:34:08 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Win-specific: ScanPopup: Fix console windows scanning under Windows 8.1

Browse source
This commit is contained in:
Abs62 2014-02-06 18:10:23 +04:00
parent 3495ba1816
commit 16691e2029
1 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
mouseover_win32/GetWord.c
View file

@ -80,14 +80,19 @@ typedef struct TConsoleParams {
int BeginPos; int BeginPos;
} TConsoleParams; } TConsoleParams;
static int GetWordFromConsolePack(TConsoleParams *params) static int GetWordFromConsolePack(TConsoleParams *params, BOOL *pInvalidConsole)
{ {
int WordLen=0; int WordLen=0;
*pInvalidConsole = TRUE;
HANDLE hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); HANDLE hStdOut = GetStdHandle(STD_OUTPUT_HANDLE);
if (hStdOut != INVALID_HANDLE_VALUE) { if (hStdOut != INVALID_HANDLE_VALUE && hStdOut != 0) {
CONSOLE_SCREEN_BUFFER_INFO csbi; CONSOLE_SCREEN_BUFFER_INFO csbi;
if (GetConsoleScreenBufferInfo(hStdOut, &csbi)) { if (GetConsoleScreenBufferInfo(hStdOut, &csbi)) {
*pInvalidConsole = FALSE;
COORD CurPos; COORD CurPos;
CurPos.X = csbi.srWindow.Left + (SHORT)(params->Pt.x * (csbi.srWindow.Right - csbi.srWindow.Left + 1) / params->ClientRect.right); CurPos.X = csbi.srWindow.Left + (SHORT)(params->Pt.x * (csbi.srWindow.Right - csbi.srWindow.Left + 1) / params->ClientRect.right);
CurPos.Y = csbi.srWindow.Top + (SHORT)(params->Pt.y * (csbi.srWindow.Bottom - csbi.srWindow.Top + 1) / params->ClientRect.bottom); CurPos.Y = csbi.srWindow.Top + (SHORT)(params->Pt.y * (csbi.srWindow.Bottom - csbi.srWindow.Top + 1) / params->ClientRect.bottom);
@ -129,6 +134,7 @@ static char* GetWordFromConsole(HWND WND, POINT Pt, DWORD *BeginPos)
DWORD pid; DWORD pid;
DWORD WordSize; DWORD WordSize;
char *Result; char *Result;
BOOL invalidConsole;
*BeginPos=0; *BeginPos=0;
if((TP = malloc(sizeof(TConsoleParams))) == NULL) if((TP = malloc(sizeof(TConsoleParams))) == NULL)
@ -145,7 +151,7 @@ static char* GetWordFromConsole(HWND WND, POINT Pt, DWORD *BeginPos)
if (pid != GetCurrentProcessId()) { if (pid != GetCurrentProcessId()) {
if(Is_XP_And_Later()) { if(Is_XP_And_Later()) {
if(AttachConsole(pid)) { if(AttachConsole(pid)) {
WordSize = GetWordFromConsolePack(TP); WordSize = GetWordFromConsolePack(TP, &invalidConsole);
FreeConsole(); FreeConsole();
} else { } else {
WordSize = 0; WordSize = 0;
@ -154,7 +160,25 @@ static char* GetWordFromConsole(HWND WND, POINT Pt, DWORD *BeginPos)
WordSize = 0; WordSize = 0;
} }
} else { } else {
WordSize = GetWordFromConsolePack(TP); WordSize = GetWordFromConsolePack(TP, &invalidConsole);
if( invalidConsole ) {
/*
Under Win 8.1 GetWindowThreadProcessId return current "conhost" process ID
instead of target window process ID.
We try to attach console to parent process.
*/
if(Is_XP_And_Later()) {
if(AttachConsole( (DWORD)-1 )) {
WordSize = GetWordFromConsolePack(TP, &invalidConsole);
FreeConsole();
} else {
WordSize = 0;
}
} else {
WordSize = 0;
}
}
} }
if (WordSize > 0 && WordSize <= 255) { if (WordSize > 0 && WordSize <= 255) {