mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-15 09:01:19 +00:00
Removed no longer needed UseXTerm internal variable.
This commit is contained in:
parent
b2f079bade
commit
41018add5d
|
@ -1176,22 +1176,10 @@ set $BreakAllThreadsStartup = 1
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
<varlistentry>
|
|
||||||
<term><varname>UseXTerm</varname></term>
|
|
||||||
<listitem>
|
|
||||||
<para>
|
|
||||||
Set to <literal>TRUE</literal> if the debugger uses
|
|
||||||
its own <command>xterm</command> window for console
|
|
||||||
input/output. Set to <literal>FALSE</literal> if
|
|
||||||
the debugger uses the current Unix console for
|
|
||||||
input/output
|
|
||||||
</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
</variablelist>
|
</variablelist>
|
||||||
|
|
||||||
<para>
|
<para>
|
||||||
Those last 3 variables are jointly used in two generic ways:
|
Those last 2 variables are jointly used in two generic ways:
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
<orderedlist>
|
<orderedlist>
|
||||||
|
@ -1200,11 +1188,13 @@ set $BreakAllThreadsStartup = 1
|
||||||
<programlisting>
|
<programlisting>
|
||||||
ConChannelMask = DBG_CHN_MESG (1)
|
ConChannelMask = DBG_CHN_MESG (1)
|
||||||
StdChannelMask = 0
|
StdChannelMask = 0
|
||||||
UseXTerm = 1
|
|
||||||
</programlisting>
|
</programlisting>
|
||||||
<para>
|
<para>
|
||||||
In this case, all input/output goes into a specific
|
In this case, all input/output goes into the
|
||||||
<command>xterm</command> window (but all debug
|
debugger's console (either the standard unix console
|
||||||
|
if winedbg is started from the command line, or a
|
||||||
|
specific windowed-console if the debugger is started
|
||||||
|
upon an exception in a running program. All debug
|
||||||
messages <function>TRACE</function>,
|
messages <function>TRACE</function>,
|
||||||
<function>WARN</function>... still goes to tty where
|
<function>WARN</function>... still goes to tty where
|
||||||
wine is run from).
|
wine is run from).
|
||||||
|
@ -1212,38 +1202,16 @@ UseXTerm = 1
|
||||||
</listitem>
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
to have all input/output go into the tty where Wine
|
To have all input/output go into the tty where Wine
|
||||||
was started from (to be used in a X11-free
|
was started from (to be used in a X11-free
|
||||||
environment)
|
environment)
|
||||||
</para>
|
</para>
|
||||||
<screen>
|
<screen>
|
||||||
ConChannelMask = 0
|
ConChannelMask = 0
|
||||||
StdChannelMask = DBG_CHN_MESG (1)
|
StdChannelMask = DBG_CHN_MESG (1)
|
||||||
UseXTerm = 1
|
|
||||||
</screen>
|
</screen>
|
||||||
</listitem>
|
</listitem>
|
||||||
</orderedlist>
|
</orderedlist>
|
||||||
<para>
|
|
||||||
Those variables also allow, for example for debugging
|
|
||||||
purposes, to use:
|
|
||||||
</para>
|
|
||||||
<screen>
|
|
||||||
ConChannelMask = 0xfff
|
|
||||||
StdChannelMask = 0xfff
|
|
||||||
UseXTerm = 1
|
|
||||||
</screen>
|
|
||||||
<para>
|
|
||||||
This allows to redirect all <function>WineDbg</function>
|
|
||||||
output to both tty Wine was started from, and
|
|
||||||
<command>xterm</command> debugging window. If Wine (or
|
|
||||||
<command>WineDbg</command>) was started with a redirection
|
|
||||||
of <filename>stdout</filename> and/or
|
|
||||||
<filename>stderr</filename> to a file (with for
|
|
||||||
example >& shell redirect command), you'll get in that
|
|
||||||
file both outputs. It may be interesting to look in the
|
|
||||||
relay trace for specific values which the process segv'ed
|
|
||||||
on.
|
|
||||||
</para>
|
|
||||||
</sect3>
|
</sect3>
|
||||||
|
|
||||||
<sect3>
|
<sect3>
|
||||||
|
|
|
@ -27,10 +27,9 @@ INTERNAL_VAR(BreakOnFirstChance, TRUE, NULL, DT_BASIC_CONST_INT)
|
||||||
INTERNAL_VAR(BreakOnDllLoad, FALSE, NULL, DT_BASIC_CONST_INT)
|
INTERNAL_VAR(BreakOnDllLoad, FALSE, NULL, DT_BASIC_CONST_INT)
|
||||||
INTERNAL_VAR(CanDeferOnBPByAddr, FALSE, NULL, DT_BASIC_CONST_INT)
|
INTERNAL_VAR(CanDeferOnBPByAddr, FALSE, NULL, DT_BASIC_CONST_INT)
|
||||||
|
|
||||||
/* output handling */
|
/* console handling */
|
||||||
INTERNAL_VAR(ConChannelMask, DBG_CHN_MESG, NULL, DT_BASIC_CONST_INT)
|
INTERNAL_VAR(ConChannelMask, DBG_CHN_MESG, NULL, DT_BASIC_CONST_INT)
|
||||||
INTERNAL_VAR(StdChannelMask, 0, NULL, DT_BASIC_CONST_INT)
|
INTERNAL_VAR(StdChannelMask, 0, NULL, DT_BASIC_CONST_INT)
|
||||||
INTERNAL_VAR(UseXTerm, TRUE, NULL, DT_BASIC_CONST_INT)
|
|
||||||
|
|
||||||
/* debugging debugger */
|
/* debugging debugger */
|
||||||
INTERNAL_VAR(ExtDbgOnInvalidAddress, FALSE, NULL, DT_BASIC_CONST_INT)
|
INTERNAL_VAR(ExtDbgOnInvalidAddress, FALSE, NULL, DT_BASIC_CONST_INT)
|
||||||
|
|
|
@ -1003,15 +1003,6 @@ static BOOL WINAPI DEBUG_CtrlCHandler(DWORD dwCtrlType)
|
||||||
|
|
||||||
static void DEBUG_InitConsole(void)
|
static void DEBUG_InitConsole(void)
|
||||||
{
|
{
|
||||||
/* keep it as a cuiexe for now, so that Wine won't touch the Unix stdin,
|
|
||||||
* stdout and stderr streams
|
|
||||||
*/
|
|
||||||
if (DBG_IVAR(UseXTerm))
|
|
||||||
{
|
|
||||||
FreeConsole();
|
|
||||||
AllocConsole();
|
|
||||||
}
|
|
||||||
|
|
||||||
/* set our control-C handler */
|
/* set our control-C handler */
|
||||||
SetConsoleCtrlHandler(DEBUG_CtrlCHandler, TRUE);
|
SetConsoleCtrlHandler(DEBUG_CtrlCHandler, TRUE);
|
||||||
|
|
||||||
|
@ -1045,7 +1036,6 @@ int main(int argc, char** argv)
|
||||||
if (local_mode != none_mode) return DEBUG_Usage();
|
if (local_mode != none_mode) return DEBUG_Usage();
|
||||||
local_mode = automatic_mode;
|
local_mode = automatic_mode;
|
||||||
/* force some internal variables */
|
/* force some internal variables */
|
||||||
DBG_IVAR(UseXTerm) = 0;
|
|
||||||
DBG_IVAR(BreakOnDllLoad) = 0;
|
DBG_IVAR(BreakOnDllLoad) = 0;
|
||||||
DBG_IVAR(ConChannelMask) = 0;
|
DBG_IVAR(ConChannelMask) = 0;
|
||||||
DBG_IVAR(StdChannelMask) = DBG_CHN_MESG;
|
DBG_IVAR(StdChannelMask) = DBG_CHN_MESG;
|
||||||
|
|
Loading…
Reference in a new issue