Got rid of -debug wine's option (wine now requires an external debugger).
This commit is contained in:
parent
02ee9ddaab
commit
5f6419fafa
|
@ -101,9 +101,6 @@ file contained in the source distribution.
|
||||||
Use the named configuration file rather than the default
|
Use the named configuration file rather than the default
|
||||||
(@sysconfdir@/wine.conf or ~/.winerc).
|
(@sysconfdir@/wine.conf or ~/.winerc).
|
||||||
.TP
|
.TP
|
||||||
.I --debug
|
|
||||||
Enter the debugger before starting application.
|
|
||||||
.TP
|
|
||||||
.I --debugmsg [xxx]#name[,[xxx1]#name1][,<+|->relay=yyy1[:yyy2]]
|
.I --debugmsg [xxx]#name[,[xxx1]#name1][,<+|->relay=yyy1[:yyy2]]
|
||||||
Turn debugging messages on or off.
|
Turn debugging messages on or off.
|
||||||
.RS +7
|
.RS +7
|
||||||
|
|
|
@ -61,7 +61,6 @@ struct options
|
||||||
char * display; /* display name */
|
char * display; /* display name */
|
||||||
char *dllFlags; /* -dll flags (hack for Winelib support) */
|
char *dllFlags; /* -dll flags (hack for Winelib support) */
|
||||||
int synchronous; /* X synchronous mode */
|
int synchronous; /* X synchronous mode */
|
||||||
int debug;
|
|
||||||
WINE_LANGUAGE language; /* Current language */
|
WINE_LANGUAGE language; /* Current language */
|
||||||
int managed; /* Managed windows */
|
int managed; /* Managed windows */
|
||||||
char * configFileName; /* Command line config file */
|
char * configFileName; /* Command line config file */
|
||||||
|
|
|
@ -89,7 +89,6 @@ struct options Options =
|
||||||
NULL, /* display */
|
NULL, /* display */
|
||||||
NULL, /* dllFlags */
|
NULL, /* dllFlags */
|
||||||
FALSE, /* synchronous */
|
FALSE, /* synchronous */
|
||||||
FALSE, /* debug */
|
|
||||||
0, /* language */
|
0, /* language */
|
||||||
FALSE, /* Managed windows */
|
FALSE, /* Managed windows */
|
||||||
NULL /* Alternate config file name */
|
NULL /* Alternate config file name */
|
||||||
|
|
|
@ -23,11 +23,9 @@ struct option
|
||||||
};
|
};
|
||||||
|
|
||||||
static void do_config( const char *arg );
|
static void do_config( const char *arg );
|
||||||
static void do_debug( const char *arg );
|
|
||||||
static void do_desktop( const char *arg );
|
static void do_desktop( const char *arg );
|
||||||
static void do_display( const char *arg );
|
static void do_display( const char *arg );
|
||||||
static void do_dll( const char *arg );
|
static void do_dll( const char *arg );
|
||||||
static void do_failreadonly( const char *arg );
|
|
||||||
static void do_help( const char *arg );
|
static void do_help( const char *arg );
|
||||||
static void do_managed( const char *arg );
|
static void do_managed( const char *arg );
|
||||||
static void do_synchronous( const char *arg );
|
static void do_synchronous( const char *arg );
|
||||||
|
@ -37,8 +35,6 @@ static const struct option option_table[] =
|
||||||
{
|
{
|
||||||
{ "config", 0, 1, do_config,
|
{ "config", 0, 1, do_config,
|
||||||
"--config name Specify config file to use" },
|
"--config name Specify config file to use" },
|
||||||
{ "debug", 0, 0, do_debug,
|
|
||||||
"--debug Enter debugger before starting application" },
|
|
||||||
{ "debugmsg", 0, 1, MAIN_ParseDebugOptions,
|
{ "debugmsg", 0, 1, MAIN_ParseDebugOptions,
|
||||||
"--debugmsg name Turn debugging-messages on or off" },
|
"--debugmsg name Turn debugging-messages on or off" },
|
||||||
{ "desktop", 0, 1, do_desktop,
|
{ "desktop", 0, 1, do_desktop,
|
||||||
|
@ -82,11 +78,6 @@ static void do_synchronous( const char *arg )
|
||||||
Options.synchronous = TRUE;
|
Options.synchronous = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void do_debug( const char *arg )
|
|
||||||
{
|
|
||||||
Options.debug = TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void do_desktop( const char *arg )
|
static void do_desktop( const char *arg )
|
||||||
{
|
{
|
||||||
Options.desktopGeometry = strdup( arg );
|
Options.desktopGeometry = strdup( arg );
|
||||||
|
|
|
@ -18,18 +18,9 @@
|
||||||
#include "wine/exception.h"
|
#include "wine/exception.h"
|
||||||
#include "debugtools.h"
|
#include "debugtools.h"
|
||||||
|
|
||||||
extern DWORD DEBUG_WinExec(LPCSTR lpCmdLine, int sw);
|
|
||||||
|
|
||||||
|
|
||||||
static BOOL exec_program( LPCSTR cmdline )
|
static BOOL exec_program( LPCSTR cmdline )
|
||||||
{
|
{
|
||||||
HINSTANCE handle;
|
HINSTANCE handle = WinExec( cmdline, SW_SHOWNORMAL );
|
||||||
|
|
||||||
if (Options.debug)
|
|
||||||
handle = DEBUG_WinExec( cmdline, SW_SHOWNORMAL );
|
|
||||||
else
|
|
||||||
handle = WinExec( cmdline, SW_SHOWNORMAL );
|
|
||||||
|
|
||||||
if (handle < 32)
|
if (handle < 32)
|
||||||
{
|
{
|
||||||
MESSAGE( "%s: can't exec '%s': ", argv0, cmdline );
|
MESSAGE( "%s: can't exec '%s': ", argv0, cmdline );
|
||||||
|
|
Loading…
Reference in New Issue