Commit 709cc314 authored by Ivan Leo Murray-Smith's avatar Ivan Leo Murray-Smith Committed by Alexandre Julliard

Changed Adam Sacarny's email, and -debugmsg to --debugmsg.

parent 3e54350d
#!/usr/bin/perl #!/usr/bin/perl
##Wine Quick Debug Report Maker Thingy (WQDRMK) ##Wine Quick Debug Report Maker Thingy (WQDRMK)
## Copyright (c) 1998-1999 Adam Sacarny ## Copyright (c) 1998-1999 Adam Sacarny jazz@cscweb.net ICQ: 19617831
##Do not say this is yours without my express permisson, or I will ##Do not say this is yours without my express permisson, or I will
##hunt you down and kill you like the savage animal I am. ##hunt you down and kill you like the savage animal I am.
## ##
...@@ -39,10 +39,6 @@ ...@@ -39,10 +39,6 @@
##January 26, 1999 - Fixed various bugs... ##January 26, 1999 - Fixed various bugs...
## - Made newbie mode easier ## - Made newbie mode easier
##January 25, 1999 - Initial Release ##January 25, 1999 - Initial Release
## -------------------------------------------
##| IRCNET/UNDERNET: jazzfan AOL: Jazzrock12 |
##| ICQ: 19617831|
## -------------------------------------------
sub do_var { sub do_var {
$var=$_[0]; $var=$_[0];
$var =~ s/\t//g; $var =~ s/\t//g;
...@@ -54,10 +50,10 @@ $var0 = qq{ ...@@ -54,10 +50,10 @@ $var0 = qq{
What is your level of Wine expertise? 1-newbie 2-intermediate 3-advanced What is your level of Wine expertise? 1-newbie 2-intermediate 3-advanced
1 - Makes a debug report as defined in the Wine documentation. Best 1 - Makes a debug report as defined in the Wine documentation. Best
for new Wine users. If you're not sure what -debugmsg is, then for new Wine users. If you're not sure what --debugmsg is, then
use this mode. use this mode.
2 - Makes a debug report that is more customizable (Example: you can 2 - Makes a debug report that is more customizable (Example: you can
choose what -debugmsg 's to use). You are asked more questions in choose what --debugmsg's to use). You are asked more questions in
this mode. May intimidate newbies. this mode. May intimidate newbies.
3 - Just like 2, but not corner cutting. Assumes you know what you're 3 - Just like 2, but not corner cutting. Assumes you know what you're
doing so it leaves out the long descriptions. doing so it leaves out the long descriptions.
...@@ -308,20 +304,20 @@ if ($debuglevel > 1) { ...@@ -308,20 +304,20 @@ if ($debuglevel > 1) {
$var11 = qq{ $var11 = qq{
Enter any extra debug options. Default is +relay - If you don't Enter any extra debug options. Default is +relay - If you don't
know what options to use, just hit enter, and I'll use those (Example, the know what options to use, just hit enter, and I'll use those (Example, the
developer tells you to re-run with -debugmsg +dosfs,+module you would type developer tells you to re-run with --debugmsg +dosfs,+module you would type
in +dosfs,+module). Hit enter if you're not sure what to do: in +dosfs,+module). Hit enter if you're not sure what to do:
}; };
print do_var($var11); print do_var($var11);
} elsif ($debuglevel =~ 3) { } elsif ($debuglevel =~ 3) {
$var12 = qq{ $var12 = qq{
Enter any debug options you would like to use. Just enter parts after Enter any debug options you would like to use. Just enter parts after
-debugmsg. Default is +relay: --debugmsg. Default is +relay:
}; };
print do_var($var12); print do_var($var12);
} }
$debugopts=<STDIN>; $debugopts=<STDIN>;
chomp $debugopts; chomp $debugopts;
if ($debugopts =~ /-debugmsg /) { if ($debugopts =~ /--debugmsg /) {
($crap, $debugopts) = split / /,$debugopts; ($crap, $debugopts) = split / /,$debugopts;
} }
if ($debugopts =~ /^\s*$/) { if ($debugopts =~ /^\s*$/) {
...@@ -477,7 +473,7 @@ if ($dbgoutfile ne "no file") { ...@@ -477,7 +473,7 @@ if ($dbgoutfile ne "no file") {
} }
elsif (defined $pid) { elsif (defined $pid) {
close(0);close(1);close(2); close(0);close(1);close(2);
exec "echo quit | $wineloc -debugmsg $debugopts $extraops \"$program\" > $dbgoutfile 2>&1"; exec "echo quit | $wineloc --debugmsg $debugopts $extraops \"$program\" > $dbgoutfile 2>&1";
} }
else { else {
die "couldn't fork"; die "couldn't fork";
...@@ -504,7 +500,7 @@ elsif ($outfile ne "no file" and $dbgoutfile eq "no file") { ...@@ -504,7 +500,7 @@ elsif ($outfile ne "no file" and $dbgoutfile eq "no file") {
} }
elsif (defined $pid) { elsif (defined $pid) {
close(0);close(1);close(2); close(0);close(1);close(2);
exec "echo quit | $wineloc -debugmsg $debugopts $extraops \"$program\" 2>&1| tee $tmpoutfile | tail -n $lastnlines > $outfile"; exec "echo quit | $wineloc --debugmsg $debugopts $extraops \"$program\" 2>&1| tee $tmpoutfile | tail -n $lastnlines > $outfile";
} }
else { else {
die "couldn't fork"; die "couldn't fork";
...@@ -536,7 +532,7 @@ else { ...@@ -536,7 +532,7 @@ else {
}; };
print do_var($var27); print do_var($var27);
$blah=<STDIN>; $blah=<STDIN>;
system("$wineloc -debugmsg $debugmsg $extraops \"$program\""); system("$wineloc --debugmsg $debugmsg $extraops \"$program\"");
} }
sub generate_outfile { sub generate_outfile {
open(OUTFILE,">$outfile"); open(OUTFILE,">$outfile");
...@@ -551,7 +547,7 @@ CPU: $cpu ...@@ -551,7 +547,7 @@ CPU: $cpu
GCC Version: $gccver GCC Version: $gccver
Program: $progname Program: $progname
Program Type: $progbits Program Type: $progbits
Debug Options: -debugmsg $debugopts Debug Options: --debugmsg $debugopts
Other Extra Commands Passed: $extraops Other Extra Commands Passed: $extraops
Extra ./configure Commands: $configopts Extra ./configure Commands: $configopts
Wine Dependencies: Wine Dependencies:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment