Why this thing ships with its own GetConsoleWindow function I don't understand. Renam...

svn path=/trunk/; revision=17553

diff --git a/reactos/apps/utils/net/telnet/src/tnclass.cpp b/reactos/apps/utils/net/telnet/src/tnclass.cpp
index 5894040..bad1700 100644 (file)
--- a/reactos/apps/utils/net/telnet/src/tnclass.cpp
+++ b/reactos/apps/utils/net/telnet/src/tnclass.cpp
@@ -78,7 +78,7 @@ void Telnet::DoInit() {
        telSetConsoleTitle("No Connection");
 
        // Change the icon
        telSetConsoleTitle("No Connection");
 
        // Change the icon

-       hConsoleWindow = GetConsoleWindow();
+       hConsoleWindow = TelnetGetConsoleWindow();

        iconChange = SetIcon(hConsoleWindow, 0, &oldBIcon, &oldSIcon, ini.get_startdir());
 
        if (WSAStartup(MAKEWORD(1, 1), &WsaData)) {
        iconChange = SetIcon(hConsoleWindow, 0, &oldBIcon, &oldSIcon, ini.get_startdir());
 
        if (WSAStartup(MAKEWORD(1, 1), &WsaData)) {


@@ -105,7 +105,7 @@ MapLoader(KeyTrans, Charmap),
 Console(GetStdHandle(STD_OUTPUT_HANDLE)),
 TelHandler(Network, Console, Parser),
 ThreadParams(TelHandler),
 Console(GetStdHandle(STD_OUTPUT_HANDLE)),
 TelHandler(Network, Console, Parser),
 ThreadParams(TelHandler),

-Clipboard(GetConsoleWindow(), Network),
+Clipboard(TelnetGetConsoleWindow(), Network),

 Mouse(Clipboard),
 Scroller(Mouse, ini.get_scroll_size()),
 Parser(Console, KeyTrans, Scroller, Network, Charmap) {
 Mouse(Clipboard),
 Scroller(Mouse, ini.get_scroll_size()),
 Parser(Console, KeyTrans, Scroller, Network, Charmap) {


@@ -117,7 +117,7 @@ MapLoader(KeyTrans, Charmap),
 Console(GetStdHandle(STD_OUTPUT_HANDLE)),
 TelHandler(Network, Console, Parser),
 ThreadParams(TelHandler),
 Console(GetStdHandle(STD_OUTPUT_HANDLE)),
 TelHandler(Network, Console, Parser),
 ThreadParams(TelHandler),

-Clipboard(GetConsoleWindow(), Network),
+Clipboard(TelnetGetConsoleWindow(), Network),

 Mouse(Clipboard),
 Scroller(Mouse, ini.get_scroll_size()),
 Parser(Console, KeyTrans, Scroller, Network, Charmap) {
 Mouse(Clipboard),
 Scroller(Mouse, ini.get_scroll_size()),
 Parser(Console, KeyTrans, Scroller, Network, Charmap) {

diff --git a/reactos/apps/utils/net/telnet/src/tnmisc.cpp b/reactos/apps/utils/net/telnet/src/tnmisc.cpp
index 797d293..64e5253 100644 (file)
--- a/reactos/apps/utils/net/telnet/src/tnmisc.cpp
+++ b/reactos/apps/utils/net/telnet/src/tnmisc.cpp
@@ -110,7 +110,7 @@ int GetWin32Version(void) {
 // Paul Brannan 8/7/98
 // This code is from Michael 'Hacker' Krelin (author of KINSole)
 // (slightly modified)
 // Paul Brannan 8/7/98
 // This code is from Michael 'Hacker' Krelin (author of KINSole)
 // (slightly modified)

-HWND GetConsoleWindow() {
+HWND TelnetGetConsoleWindow() {

        DWORD pid = GetCurrentProcessId(), wpid;
        char title[512], *t = title;
        HWND hrv = NULL;
        DWORD pid = GetCurrentProcessId(), wpid;
        char title[512], *t = title;
        HWND hrv = NULL;

diff --git a/reactos/apps/utils/net/telnet/src/tnmisc.h b/reactos/apps/utils/net/telnet/src/tnmisc.h
index 2c23daa..8216a86 100644 (file)
--- a/reactos/apps/utils/net/telnet/src/tnmisc.h
+++ b/reactos/apps/utils/net/telnet/src/tnmisc.h
@@ -9,7 +9,7 @@ BOOL SpawnProcess(char *cmd_line, PROCESS_INFORMATION *pi);
 
 int GetWin32Version(void);
 
 
 int GetWin32Version(void);
 

-HWND GetConsoleWindow();
+HWND TelnetGetConsoleWindow(void);

 
 bool SetIcon(HWND hConsoleWindow, HANDLE hIcon, LPARAM *pOldBIcon, LPARAM *pOldSIcon,
                         const char *icondir);
 
 bool SetIcon(HWND hConsoleWindow, HANDLE hIcon, LPARAM *pOldBIcon, LPARAM *pOldSIcon,
                         const char *icondir);