diff --git a/configure b/configure index ae38153908e..32ac89373bf 100755 --- a/configure +++ b/configure @@ -14192,7 +14192,7 @@ MAKE_TEST_RULES=dlls/Maketest.rules MAKE_PROG_RULES=programs/Makeprog.rules -ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules programs/Makeprog.rules Makefile debugger/Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/d3d8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dsound/Makefile dlls/gdi/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt20/Makefile dlls/msvideo/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile library/Makefile miscemu/Makefile ole/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineconsole/Makefile programs/winefile/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wpp/Makefile tools/wrc/Makefile tsx11/Makefile unicode/Makefile" +ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/d3d8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dsound/Makefile dlls/gdi/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt20/Makefile dlls/msvideo/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile library/Makefile miscemu/Makefile ole/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wpp/Makefile tools/wrc/Makefile tsx11/Makefile unicode/Makefile" cat >confcache <<\_ACEOF @@ -14674,7 +14674,6 @@ do "dlls/Maketest.rules" ) CONFIG_FILES="$CONFIG_FILES dlls/Maketest.rules" ;; "programs/Makeprog.rules" ) CONFIG_FILES="$CONFIG_FILES programs/Makeprog.rules" ;; "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "debugger/Makefile" ) CONFIG_FILES="$CONFIG_FILES debugger/Makefile" ;; "dlls/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/Makefile" ;; "dlls/advapi32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/advapi32/Makefile" ;; "dlls/advapi32/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/advapi32/tests/Makefile" ;; @@ -14804,6 +14803,7 @@ do "programs/view/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/view/Makefile" ;; "programs/wcmd/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/wcmd/Makefile" ;; "programs/wineconsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/wineconsole/Makefile" ;; + "programs/winedbg/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/winedbg/Makefile" ;; "programs/winefile/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/winefile/Makefile" ;; "programs/winemine/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/winemine/Makefile" ;; "programs/winepath/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/winepath/Makefile" ;; diff --git a/configure.ac b/configure.ac index c314a10ccac..1d3b5f7739e 100644 --- a/configure.ac +++ b/configure.ac @@ -1365,7 +1365,6 @@ dlls/Makedll.rules dlls/Maketest.rules programs/Makeprog.rules Makefile -debugger/Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile @@ -1495,6 +1494,7 @@ programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineconsole/Makefile +programs/winedbg/Makefile programs/winefile/Makefile programs/winemine/Makefile programs/winepath/Makefile diff --git a/debugger/TODO b/debugger/TODO deleted file mode 100644 index c527b922b8c..00000000000 --- a/debugger/TODO +++ /dev/null @@ -1,35 +0,0 @@ -This is a list of things that theoretically should be possible in some -way or another. No commitment to actually do these, but these sound -possible to me right now. In no particular order. If someone else -wants to dig in, feel free. - -1) Some kind of watchpoint capability. Pretty easy, but we end up - running the program really slowly one instruction at a time. - Use hardware debug registers for this (much harder)??? - -2) Some kind of .wdbinit file. - -3) Add 'info line' command. Not all *that* useful, but it would tell you - the range of PC for a given source line. - -4) Add search directory list for PDB files. We have the path in the - DOS notation (i.e. C:\foo\bar\xxx.c), which may be a useful hint. - Maybe not. - -5) Add support for emacs mode so that you can run under emacs and have - the source pop up automatically. Only useful once the list command - is implemented. - -6 Add support for Borland. I have heard rumors that Borland is forthcoming - with info about how their stuff works, so this might not be that - bad. - -7 Add support for Win16. Not sure if this is really worth the trouble. How - much are people really going to use this in the long run??? - -8) Some of the newer displays are still a little bit sparse on information. - Make these more like gdb. - -9) Make sure operator precedence works OK. - -**************** diff --git a/programs/Makefile.in b/programs/Makefile.in index 981fa13dbda..d0e5073b7e8 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = none SUBDIRS = \ - $(TOPOBJDIR)/debugger \ avitools \ clock \ cmdlgtst \ @@ -22,6 +21,7 @@ SUBDIRS = \ view \ wcmd \ wineconsole \ + winedbg \ winefile \ winemine \ winepath \ @@ -101,10 +101,10 @@ check test:: $(SUBDIRS:%=%/__test__) wineconsole.exe$(DLLEXT): wineconsole/wineconsole.exe$(DLLEXT) $(RM) $@ && $(LN_S) wineconsole/wineconsole.exe$(DLLEXT) $@ -winedbg.exe$(DLLEXT): $(TOPOBJDIR)/debugger/winedbg.exe$(DLLEXT) - $(RM) $@ && $(LN_S) $(TOPOBJDIR)/debugger/winedbg.exe$(DLLEXT) $@ +winedbg.exe$(DLLEXT): winedbg/winedbg.exe$(DLLEXT) + $(RM) $@ && $(LN_S) winedbg/winedbg.exe$(DLLEXT) $@ wineconsole/wineconsole.exe$(DLLEXT): wineconsole -$(TOPOBJDIR)/debugger/winedbg.exe$(DLLEXT): $(TOPOBJDIR)/debugger +winedbg/winedbg.exe$(DLLEXT): winedbg ### Dependencies: diff --git a/debugger/.cvsignore b/programs/winedbg/.cvsignore similarity index 100% rename from debugger/.cvsignore rename to programs/winedbg/.cvsignore diff --git a/debugger/Makefile.in b/programs/winedbg/Makefile.in similarity index 97% rename from debugger/Makefile.in rename to programs/winedbg/Makefile.in index 6dc8a9ec7ad..c57c3bfe161 100644 --- a/debugger/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -1,5 +1,5 @@ TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = .. +TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winedbg.exe diff --git a/debugger/README b/programs/winedbg/README similarity index 100% rename from debugger/README rename to programs/winedbg/README diff --git a/debugger/break.c b/programs/winedbg/break.c similarity index 100% rename from debugger/break.c rename to programs/winedbg/break.c diff --git a/debugger/db_disasm.c b/programs/winedbg/db_disasm.c similarity index 99% rename from debugger/db_disasm.c rename to programs/winedbg/db_disasm.c index 99945a1283f..54f2d69777b 100644 --- a/debugger/db_disasm.c +++ b/programs/winedbg/db_disasm.c @@ -1826,4 +1826,3 @@ void DEBUG_Disasm( DBG_ADDR *addr, int display ) } #endif /* __i386__ */ - diff --git a/debugger/dbg.y b/programs/winedbg/dbg.y similarity index 100% rename from debugger/dbg.y rename to programs/winedbg/dbg.y diff --git a/debugger/debug.l b/programs/winedbg/debug.l similarity index 100% rename from debugger/debug.l rename to programs/winedbg/debug.l diff --git a/debugger/debugger.h b/programs/winedbg/debugger.h similarity index 100% rename from debugger/debugger.h rename to programs/winedbg/debugger.h diff --git a/debugger/display.c b/programs/winedbg/display.c similarity index 100% rename from debugger/display.c rename to programs/winedbg/display.c diff --git a/debugger/expr.c b/programs/winedbg/expr.c similarity index 100% rename from debugger/expr.c rename to programs/winedbg/expr.c diff --git a/debugger/expr.h b/programs/winedbg/expr.h similarity index 100% rename from debugger/expr.h rename to programs/winedbg/expr.h diff --git a/debugger/ext_debugger.c b/programs/winedbg/ext_debugger.c similarity index 100% rename from debugger/ext_debugger.c rename to programs/winedbg/ext_debugger.c diff --git a/debugger/gdbproxy.c b/programs/winedbg/gdbproxy.c similarity index 100% rename from debugger/gdbproxy.c rename to programs/winedbg/gdbproxy.c diff --git a/debugger/hash.c b/programs/winedbg/hash.c similarity index 100% rename from debugger/hash.c rename to programs/winedbg/hash.c diff --git a/debugger/info.c b/programs/winedbg/info.c similarity index 100% rename from debugger/info.c rename to programs/winedbg/info.c diff --git a/debugger/intvar.h b/programs/winedbg/intvar.h similarity index 100% rename from debugger/intvar.h rename to programs/winedbg/intvar.h diff --git a/debugger/memory.c b/programs/winedbg/memory.c similarity index 100% rename from debugger/memory.c rename to programs/winedbg/memory.c diff --git a/debugger/module.c b/programs/winedbg/module.c similarity index 100% rename from debugger/module.c rename to programs/winedbg/module.c diff --git a/debugger/msc.c b/programs/winedbg/msc.c similarity index 100% rename from debugger/msc.c rename to programs/winedbg/msc.c diff --git a/debugger/registers.c b/programs/winedbg/registers.c similarity index 100% rename from debugger/registers.c rename to programs/winedbg/registers.c diff --git a/debugger/source.c b/programs/winedbg/source.c similarity index 100% rename from debugger/source.c rename to programs/winedbg/source.c diff --git a/debugger/stabs.c b/programs/winedbg/stabs.c similarity index 100% rename from debugger/stabs.c rename to programs/winedbg/stabs.c diff --git a/debugger/stack.c b/programs/winedbg/stack.c similarity index 99% rename from debugger/stack.c rename to programs/winedbg/stack.c index 36333f761ce..d4fbab744f5 100644 --- a/debugger/stack.c +++ b/programs/winedbg/stack.c @@ -474,4 +474,3 @@ DEBUG_GetCurrentFrame(struct name_hash ** name, unsigned int * eip, return FALSE; #endif /* __i386__ */ } - diff --git a/debugger/types.c b/programs/winedbg/types.c similarity index 100% rename from debugger/types.c rename to programs/winedbg/types.c diff --git a/debugger/winedbg.c b/programs/winedbg/winedbg.c similarity index 100% rename from debugger/winedbg.c rename to programs/winedbg/winedbg.c