OutputDebugStringW95 removed - it's really unnecessary - and the references to
DBWIN32 in the docs replaced with DbgView git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1064,140 +1064,6 @@ 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
|
||||
*/
|
||||
|
||||
#if !defined(__MWERKS__) && !defined(__SALFORDC__) && !defined(__TWIN32__)
|
||||
#include <process.h>
|
||||
#endif
|
||||
|
||||
void OutputDebugStringW95(const wxChar* lpOutputString, ...)
|
||||
{
|
||||
HANDLE heventDBWIN; /* DBWIN32 synchronization object */
|
||||
HANDLE heventData; /* data passing synch object */
|
||||
HANDLE hSharedFile; /* memory mapped file shared data */
|
||||
LPSTR lpszSharedMem;
|
||||
wxChar achBuffer[500];
|
||||
|
||||
/* create the output buffer */
|
||||
va_list args;
|
||||
va_start(args, lpOutputString);
|
||||
wxVsprintf(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
|
||||
#ifdef __TWIN32__
|
||||
::OutputDebugString(achBuffer);
|
||||
#else
|
||||
::OutputDebugStringA(achBuffer);
|
||||
#endif
|
||||
#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, wxT("DBWIN_BUFFER_READY"));
|
||||
if ( !heventDBWIN )
|
||||
{
|
||||
//MessageBox(NULL, wxT("DBWIN_BUFFER_READY nonexistent"), NULL, MB_OK);
|
||||
return;
|
||||
}
|
||||
|
||||
/* get a handle to the data synch object */
|
||||
heventData = OpenEvent(EVENT_MODIFY_STATE, FALSE, wxT("DBWIN_DATA_READY"));
|
||||
if ( !heventData )
|
||||
{
|
||||
// MessageBox(NULL, wxT("DBWIN_DATA_READY nonexistent"), NULL, MB_OK);
|
||||
CloseHandle(heventDBWIN);
|
||||
return;
|
||||
}
|
||||
|
||||
hSharedFile = CreateFileMapping((HANDLE)-1, NULL, PAGE_READWRITE, 0, 4096, wxT("DBWIN_BUFFER"));
|
||||
if (!hSharedFile)
|
||||
{
|
||||
//MessageBox(NULL, wxT("DebugTrace: Unable to create file mapping object DBWIN_BUFFER"), wxT("Error"), MB_OK);
|
||||
CloseHandle(heventDBWIN);
|
||||
CloseHandle(heventData);
|
||||
return;
|
||||
}
|
||||
|
||||
lpszSharedMem = (LPSTR)MapViewOfFile(hSharedFile, FILE_MAP_WRITE, 0, 0, 512);
|
||||
if (!lpszSharedMem)
|
||||
{
|
||||
//MessageBox(NULL, wxT("DebugTrace: Unable to map shared memory"), wxT("Error"), MB_OK);
|
||||
CloseHandle(heventDBWIN);
|
||||
CloseHandle(heventData);
|
||||
return;
|
||||
}
|
||||
|
||||
/* wait for buffer event */
|
||||
WaitForSingleObject(heventDBWIN, INFINITE);
|
||||
|
||||
/* write it to the shared memory */
|
||||
#if defined( __BORLANDC__ ) || defined( __MWERKS__ ) || defined(__SALFORDC__)
|
||||
*((LPDWORD)lpszSharedMem) = getpid();
|
||||
#else
|
||||
*((LPDWORD)lpszSharedMem) = _getpid();
|
||||
#endif
|
||||
|
||||
wsprintf((LPTSTR)(lpszSharedMem + sizeof(DWORD)), wxT("%s"), achBuffer);
|
||||
|
||||
/* signal data ready event */
|
||||
SetEvent(heventData);
|
||||
|
||||
/* clean up handles */
|
||||
CloseHandle(hSharedFile);
|
||||
CloseHandle(heventData);
|
||||
CloseHandle(heventDBWIN);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
#if 0
|
||||
|
||||
// maximum mumber of lines the output console should have
|
||||
|
Reference in New Issue
Block a user