anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-18 21:45:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

check that GetConsoleTitle succeeded

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@9888 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2005-04-29 08:42:22 +00:00
parent f8d127b3e9
commit 6b475001b1
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/support/ChangeLog
View File

@ -1,3 +1,7 @@
2005-04-29 Angus Leeming <leeming@lyx.org>
* os_win32.C (init): check that GetConsoleTitle succeeded.
2005-04-22 Angus Leeming <leeming@lyx.org>
* package.C (get_binary_path): on prompting from Rob Bearman,

20
src/support/os_win32.C
View File

@ -10,7 +10,6 @@
#include <windows.h>
#include <io.h>
#include <fcntl.h>
#include <direct.h> // _getdrive
@ -40,7 +39,7 @@ void os::init(int /* argc */, char * argv[])
*
* #if defined (_WIN32)
* # define WIN32_LEAN_AND_MEAN
* # include <stdlib.h> // for __argc,__argv
* # include <stdlib.h> // for __argc, __argv
* # include <windows.h> // for WinMain
* #endif
*
@ -50,7 +49,7 @@ void os::init(int /* argc */, char * argv[])
* #if defined (_WIN32)
* int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
* {
* return mymain(__argc, __argv);
* return mymain(__argc, __argv);
* }
* #endif
*
@ -76,12 +75,15 @@ void os::init(int /* argc */, char * argv[])
// Close the console when run (probably)
// not run from command prompt
char WindowTitle[1024];
HWND hwndFound;
GetConsoleTitle(WindowTitle,1024);
if (GetConsoleTitle(WindowTitle, sizeof(WindowTitle)) == 0) {
// Could not get the title, so we just leave things as they are
return;
}
if ((strcmp(WindowTitle, argv[0]) == 0) ||
(strcmp(WindowTitle,"LyX") == 0)) {
(strcmp(WindowTitle, "LyX") == 0)) {
// format a "unique" newWindowTitle
wsprintf(WindowTitle,"%d/%d",
wsprintf(WindowTitle, "%d/%d",
GetTickCount(),
GetCurrentProcessId());
// change current window title
@ -89,9 +91,9 @@ void os::init(int /* argc */, char * argv[])
// ensure window title has been updated
Sleep(40);
// look for newWindowTitle
hwndFound=FindWindow(NULL, WindowTitle);
HWND const hwndFound = FindWindow(NULL, WindowTitle);
// If found, hide it
if ( hwndFound != NULL)
if (hwndFound != NULL)
ShowWindow( hwndFound, SW_HIDE);
}
}