X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c4a764c984ba8e482e5d808fd1c762aeb5b535a..6f63ec3f93070e6824da775cf8d2565a025c2406:/src/msw/utils.cpp?ds=sidebyside diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index d495c7f480..fdb322892c 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -10,9 +10,7 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -// Note: this is done in utilscmn.cpp now. -// #pragma implementation -// #pragma implementation "utils.h" +// #pragma implementation "utils.h" // Note: this is done in utilscmn.cpp now. #endif // For compilers that support precompilation, includes "wx.h". @@ -32,6 +30,8 @@ #include "wx/msw/private.h" #include "wx/timer.h" +#include + #include #ifndef __GNUWIN32__ @@ -42,10 +42,6 @@ #ifdef __GNUWIN32__ #include #include -#ifndef __MINGW32__ -#include -#endif //MINGW32 - #endif //GNUWIN32 #include "wx/log.h" @@ -74,6 +70,52 @@ #endif #include +//// BEGIN for console support: VC++ only + +#if defined(__WXDEBUG__) && defined(_MSC_VER) && !defined(__NO_VC_CRTDBG__) + #define wxUSE_VC_CRTDBG +#else + #undef wxUSE_VC_CRTDBG +#endif + +#ifdef wxUSE_VC_CRTDBG + // VC++ uses this macro as debug/release mode indicator + #ifndef _DEBUG + #define _DEBUG + #endif + + #include + +#if wxUSE_IOSTREAMH +// N.B. BC++ doesn't have istream.h, ostream.h +# include +# include +# include + +#else +# include +# include +# include +# ifdef _MSC_VER + using namespace std; +# endif +#endif + +/* Need to undef new if including crtdbg.h */ +# ifdef new +# undef new +# endif + +# include + +# if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS +# define new new(__FILE__,__LINE__) +# endif + +#endif + +/// END for console support + // In the WIN.INI file static const char WX_SECTION[] = "wxWindows"; static const char eHOSTNAME[] = "HostName"; @@ -120,12 +162,12 @@ bool wxGetUserId(char *buf, int maxSize) WCHAR wszUserName[256]; // Unicode user name WCHAR wszDomain[256]; LPBYTE ComputerName; - + struct _SERVER_INFO_100 *si100; // Server structure struct _USER_INFO_2 *ui; // User structure - + // Convert ASCII user name and domain to Unicode. - + MultiByteToWideChar( CP_ACP, 0, UserName, strlen(UserName)+1, wszUserName, sizeof(wszUserName) ); MultiByteToWideChar( CP_ACP, 0, Domain, @@ -133,20 +175,20 @@ bool wxGetUserId(char *buf, int maxSize) // Get the computer name of a DC for the specified domain. // >If you get a link error on this, include netapi32.lib< - + NetGetDCName( NULL, wszDomain, &ComputerName ); - + // Look up the user on the DC. - + if(NetUserGetInfo( (LPWSTR) ComputerName, (LPWSTR) &wszUserName, 2, (LPBYTE *) &ui)) { printf( "Error getting user information.\n" ); return( FALSE ); } - + // Convert the Unicode full name to ASCII. - + WideCharToMultiByte( CP_ACP, 0, ui->usri2_full_name, -1, buf, 256, NULL, NULL ); } @@ -174,7 +216,7 @@ bool wxGetUserId(char *buf, int maxSize) // Get user name e.g. Julian Smart bool wxGetUserName(char *buf, int maxSize) { - const char *default_name = "Unknown User"; + const char *default_name = "Unknown User"; #if defined(__WIN32__) /* DWORD nSize = maxSize; @@ -184,12 +226,12 @@ bool wxGetUserName(char *buf, int maxSize) else */ // Could use NIS, MS-Mail or other site specific programs - // Use wxWindows configuration data + // Use wxWindows configuration data GetProfileString(WX_SECTION, eUSERNAME, default_name, buf, maxSize - 1); return *buf ? TRUE : FALSE; // } #else -#if !defined(__WATCOMC__) && !defined(__GNUWIN32__) && USE_PENWINDOWS +#if !defined(__WATCOMC__) && !defined(__GNUWIN32__) && wxUSE_PENWINDOWS extern HANDLE g_hPenWin; // PenWindows Running? if (g_hPenWin) { @@ -202,7 +244,7 @@ bool wxGetUserName(char *buf, int maxSize) #endif { // Could use NIS, MS-Mail or other site specific programs - // Use wxWindows configuration data + // Use wxWindows configuration data GetProfileString(WX_SECTION, eUSERNAME, default_name, buf, maxSize - 1); } return *buf ? TRUE : FALSE; @@ -323,11 +365,13 @@ void wxFatalError(const wxString& msg, const wxString& title) // Emit a beeeeeep void wxBell(void) { -#ifdef __WIN32__ - Beep(1000,1000) ; // 1kHz during 1 sec. -#else - MessageBeep(-1) ; -#endif + // Removed by RD because IHMO syncronous sound is a Bad Thing. MessageBeep + // will do a similar thing anyway if there is no sound card... +//#ifdef __WIN32__ +// Beep(1000,1000) ; // 1kHz during 1 sec. +//#else + MessageBeep((UINT)-1) ; +//#endif } // Chris Breeze 27/5/98: revised WIN32 code to @@ -366,7 +410,7 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn) # ifdef __WINDOWS_386__ retValue = wxWIN386; # else -# if !defined(__WATCOMC__) && !defined(GNUWIN32) && USE_PENWINDOWS +# if !defined(__WATCOMC__) && !defined(GNUWIN32) && wxUSE_PENWINDOWS extern HANDLE g_hPenWin; retValue = g_hPenWin ? wxPENWINDOWS : wxWINDOWS ; # endif @@ -379,7 +423,7 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn) } // Reading and writing resources (eg WIN.INI, .Xdefaults) -#if USE_RESOURCES +#if wxUSE_RESOURCES bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file) { if (file != "") @@ -464,12 +508,12 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c if (succ) { *value = (int)strtol(s, NULL, 10); - delete[] s; + delete[] s; return TRUE; } else return FALSE; } -#endif // USE_RESOURCES +#endif // wxUSE_RESOURCES // Old cursor static HCURSOR wxBusyCursorOld = 0; @@ -494,7 +538,7 @@ void wxEndBusyCursor(void) { if (wxBusyCursorCount == 0) return; - + wxBusyCursorCount --; if (wxBusyCursorCount == 0) { @@ -507,9 +551,9 @@ void wxEndBusyCursor(void) bool wxIsBusy(void) { return (wxBusyCursorCount > 0); -} +} -const char* WXDLLEXPORT wxGetHomeDir(wxString *pstr) +const char* wxGetHomeDir(wxString *pstr) { wxString& strDir = *pstr; @@ -641,7 +685,7 @@ char *wxLoadUserResource(const wxString& resourceName, const wxString& resourceT char *theText = (char *)LockResource(hData); if (!theText) return NULL; - + s = copystring(theText); // Obsolete in WIN32 @@ -900,3 +944,197 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special ) #endif +#if defined(__WIN95__) && defined(__WXDEBUG__) && wxUSE_DBWIN32 + +/* +When I started programming with Visual C++ v4.0, I missed one of my favorite +tools -- DBWIN. Finding the code for a simple debug trace utility, DBMON, +on MSDN was a step in the right direction, but it is a console application +and thus has limited features and extensibility. DBWIN32 is my creation +to solve this problem. + +The code is essentially a merging of a stripped down version of the DBWIN code +from VC 1.5 and DBMON.C with a few 32 bit changes. + +As of version 1.2B, DBWIN32 supports both Win95 and NT. The NT support is +built into the operating system and works just by running DBWIN32. The Win95 +team decided not to support this hook, so I have provided code that will do +this for you. See the file WIN95.TXT for instructions on installing this. + +If you have questions, problems or suggestions about DBWIN32, I welcome your +feedback and plan to actively maintain the code. + +Andrew Tucker +ast@halcyon.com + +To download dbwin32, see e.g.: + +http://ftp.digital.com/pub/micro/NT/WinSite/programr/dbwin32.zip +*/ + +#include + +void OutputDebugStringW95(const char* lpOutputString, ...) +{ + HANDLE heventDBWIN; /* DBWIN32 synchronization object */ + HANDLE heventData; /* data passing synch object */ + HANDLE hSharedFile; /* memory mapped file shared data */ + LPSTR lpszSharedMem; + char achBuffer[500]; + + /* create the output buffer */ + va_list args; + va_start(args, lpOutputString); + vsprintf(achBuffer, lpOutputString, args); + va_end(args); + + /* + Do a regular OutputDebugString so that the output is + still seen in the debugger window if it exists. + + This ifdef is necessary to avoid infinite recursion + from the inclusion of W95TRACE.H + */ +#ifdef _UNICODE + ::OutputDebugStringW(achBuffer); +#else + ::OutputDebugStringA(achBuffer); +#endif + + /* bail if it's not Win95 */ + { + OSVERSIONINFO VerInfo; + VerInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&VerInfo); + if ( VerInfo.dwPlatformId != VER_PLATFORM_WIN32_WINDOWS ) + return; + } + + /* make sure DBWIN is open and waiting */ + heventDBWIN = OpenEvent(EVENT_MODIFY_STATE, FALSE, "DBWIN_BUFFER_READY"); + if ( !heventDBWIN ) + { + //MessageBox(NULL, "DBWIN_BUFFER_READY nonexistent", NULL, MB_OK); + return; + } + + /* get a handle to the data synch object */ + heventData = OpenEvent(EVENT_MODIFY_STATE, FALSE, "DBWIN_DATA_READY"); + if ( !heventData ) + { + // MessageBox(NULL, "DBWIN_DATA_READY nonexistent", NULL, MB_OK); + CloseHandle(heventDBWIN); + return; + } + + hSharedFile = CreateFileMapping((HANDLE)-1, NULL, PAGE_READWRITE, 0, 4096, "DBWIN_BUFFER"); + if (!hSharedFile) + { + //MessageBox(NULL, "DebugTrace: Unable to create file mapping object DBWIN_BUFFER", "Error", MB_OK); + CloseHandle(heventDBWIN); + CloseHandle(heventData); + return; + } + + lpszSharedMem = (LPSTR)MapViewOfFile(hSharedFile, FILE_MAP_WRITE, 0, 0, 512); + if (!lpszSharedMem) + { + //MessageBox(NULL, "DebugTrace: Unable to map shared memory", "Error", MB_OK); + CloseHandle(heventDBWIN); + CloseHandle(heventData); + return; + } + + /* wait for buffer event */ + WaitForSingleObject(heventDBWIN, INFINITE); + + /* write it to the shared memory */ +#ifdef __BORLANDC__ + *((LPDWORD)lpszSharedMem) = getpid(); +#else + *((LPDWORD)lpszSharedMem) = _getpid(); +#endif + + wsprintf(lpszSharedMem + sizeof(DWORD), "%s", achBuffer); + + /* signal data ready event */ + SetEvent(heventData); + + /* clean up handles */ + CloseHandle(hSharedFile); + CloseHandle(heventData); + CloseHandle(heventDBWIN); + + return; +} + + +#endif + + +#ifdef wxUSE_VC_CRTDBG + +// maximum mumber of lines the output console should have +static const WORD MAX_CONSOLE_LINES = 500; + +BOOL WINAPI MyConsoleHandler( DWORD dwCtrlType ) { // control signal type + FreeConsole(); + return TRUE; +} + +void wxRedirectIOToConsole() +{ + int hConHandle; + long lStdHandle; + CONSOLE_SCREEN_BUFFER_INFO coninfo; + FILE *fp; + + // allocate a console for this app + AllocConsole(); + + // set the screen buffer to be big enough to let us scroll text + GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), + &coninfo); + coninfo.dwSize.Y = MAX_CONSOLE_LINES; + SetConsoleScreenBufferSize(GetStdHandle(STD_OUTPUT_HANDLE), + coninfo.dwSize); + + // redirect unbuffered STDOUT to the console + lStdHandle = (long)GetStdHandle(STD_OUTPUT_HANDLE); + hConHandle = _open_osfhandle(lStdHandle, _O_TEXT); + if(hConHandle <= 0) return; + fp = _fdopen( hConHandle, "w" ); + *stdout = *fp; + setvbuf( stdout, NULL, _IONBF, 0 ); + + // redirect unbuffered STDIN to the console + lStdHandle = (long)GetStdHandle(STD_INPUT_HANDLE); + hConHandle = _open_osfhandle(lStdHandle, _O_TEXT); + if(hConHandle <= 0) return; + fp = _fdopen( hConHandle, "r" ); + *stdin = *fp; + setvbuf( stdin, NULL, _IONBF, 0 ); + + // redirect unbuffered STDERR to the console + lStdHandle = (long)GetStdHandle(STD_ERROR_HANDLE); + hConHandle = _open_osfhandle(lStdHandle, _O_TEXT); + if(hConHandle <= 0) return; + fp = _fdopen( hConHandle, "w" ); + *stderr = *fp; + setvbuf( stderr, NULL, _IONBF, 0 ); + + // make cout, wcout, cin, wcin, wcerr, cerr, wclog and clog + // point to console as well + ios::sync_with_stdio(); + + SetConsoleCtrlHandler(MyConsoleHandler, TRUE); + +} +#else +// Not supported +void wxRedirectIOToConsole() +{ +} +#endif + +