move from branch
authorSylvain Petreolle <spetreolle@yahoo.fr>
Sun, 11 Feb 2007 11:21:14 +0000 (11:21 +0000)
committerSylvain Petreolle <spetreolle@yahoo.fr>
Sun, 11 Feb 2007 11:21:14 +0000 (11:21 +0000)
svn path=/trunk/; revision=25781

731 files changed:
reactos/Makefile
reactos/ReactOS.rbuild
reactos/base/applications/cacls/cacls.c
reactos/base/applications/calc/winecalc.c
reactos/base/applications/cmdutils/find/find.c
reactos/base/applications/downloader/downloader.rbuild
reactos/base/applications/downloader/downloader.xml
reactos/base/applications/downloader/main.c
reactos/base/applications/downloader/resources.h
reactos/base/applications/downloader/resources/10.bmp [new file with mode: 0644]
reactos/base/applications/downloader/resources/9.bmp [new file with mode: 0644]
reactos/base/applications/downloader/resources/uninstall.bmp [new file with mode: 0644]
reactos/base/applications/downloader/rsrc.rc
reactos/base/applications/downloader/structures.h
reactos/base/applications/downloader/translations/de.rc
reactos/base/applications/downloader/translations/en.rc
reactos/base/applications/downloader/translations/fr.rc
reactos/base/applications/downloader/translations/it.rc
reactos/base/applications/downloader/xml.c
reactos/base/applications/games/solitaire/solitaire.cpp
reactos/base/applications/ibrowser/mainframe.cpp
reactos/base/applications/ibrowser/utility/utility.h
reactos/base/applications/ibrowser/utility/xmlstorage.h
reactos/base/applications/ibrowser/webchild.cpp
reactos/base/applications/imagesoft/tooldock.c
reactos/base/applications/network/ftp/ftp.c
reactos/base/applications/network/roshttpd/common/socket.cpp
reactos/base/applications/network/roshttpd/httpd.cpp
reactos/base/applications/network/roshttpd/include/httpd.h
reactos/base/applications/network/roshttpd/include/socket.h
reactos/base/applications/network/telnet/src/tconsole.cpp
reactos/base/applications/regedit/clb/clb.def
reactos/base/applications/screensavers/cylfrac/cylfrac.c
reactos/base/applications/taskmgr/proclist.c
reactos/base/applications/testsets/smss/movefile/movefile.cpp
reactos/base/applications/utils/binpatch/patch.c
reactos/base/setup/usetup/bootsup.c
reactos/base/setup/usetup/partlist.c
reactos/base/setup/welcome/welcome.c
reactos/base/shell/cmd/cmd.rbuild
reactos/base/shell/cmd/console.c
reactos/base/shell/cmd/dir.c
reactos/base/shell/cmd/it-IT.rc
reactos/base/shell/explorer/dialogs/searchprogram.cpp
reactos/base/shell/explorer/explorer-fr.rc
reactos/base/shell/explorer/explorer.cpp
reactos/base/shell/explorer/services/shellservices.h
reactos/base/shell/explorer/services/startup.c
reactos/base/shell/explorer/shell/mainframe.cpp
reactos/base/shell/explorer/shell/ntobjfs.cpp
reactos/base/shell/explorer/shell/webchild.cpp
reactos/base/shell/explorer/taskbar/desktopbar.cpp
reactos/base/shell/explorer/utility/utility.h
reactos/base/shell/explorer/utility/xmlstorage.cpp
reactos/base/shell/explorer/utility/xmlstorage.h
reactos/base/system/autochk/autochk.c
reactos/base/system/expand/resource.h
reactos/base/system/rundll32/lang/nl-NL.rc [new file with mode: 0644]
reactos/base/system/rundll32/rsrc.rc
reactos/base/system/winlogon/screensaver.c
reactos/baseaddress.rbuild
reactos/boot/bootdata/hivesys.inf
reactos/boot/bootdata/livecd.ini
reactos/boot/bootdata/packages/reactos.dff
reactos/boot/bootdata/txtsetup.sif
reactos/boot/freeldr/freeldr/arch/i386/hardware.c
reactos/boot/freeldr/freeldr/arch/i386/loader.c
reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c
reactos/boot/freeldr/freeldr/bootmgr.c
reactos/boot/freeldr/freeldr/custom.c
reactos/boot/freeldr/freeldr/drivemap.c
reactos/boot/freeldr/freeldr/include/drivemap.h
reactos/boot/freeldr/freeldr/include/linux.h
reactos/boot/freeldr/freeldr/include/miscboot.h
reactos/boot/freeldr/freeldr/include/options.h
reactos/boot/freeldr/freeldr/inifile/inifile.c
reactos/boot/freeldr/freeldr/linuxboot.c
reactos/boot/freeldr/freeldr/miscboot.c
reactos/boot/freeldr/freeldr/reactos/reactos.c
reactos/config.rbuild [deleted file]
reactos/config.template.rbuild
reactos/depmap.xsl [new file with mode: 0644]
reactos/dll/3rdparty/freetype/builds/win32/visualc/freetype.dsp
reactos/dll/3rdparty/freetype/builds/win32/visualc/freetype.sln
reactos/dll/3rdparty/freetype/builds/win32/visualc/freetype.vcproj
reactos/dll/3rdparty/mesa32/mesa32.rbuild
reactos/dll/cpl/access/It.rc [new file with mode: 0644]
reactos/dll/cpl/access/access.rc
reactos/dll/cpl/desk/Fr.rc
reactos/dll/cpl/desk/It.rc
reactos/dll/cpl/desk/Ja.rc
reactos/dll/cpl/desk/Ru.rc
reactos/dll/cpl/desk/Uk.rc
reactos/dll/cpl/desk/appearance.c
reactos/dll/cpl/desk/cz.rc
reactos/dll/cpl/desk/de.rc
reactos/dll/cpl/desk/en.rc
reactos/dll/cpl/desk/es.rc
reactos/dll/cpl/desk/gr.rc
reactos/dll/cpl/desk/hu.rc
reactos/dll/cpl/desk/nl.rc
reactos/dll/cpl/desk/pl.rc
reactos/dll/cpl/desk/preview.c
reactos/dll/cpl/desk/preview.h
reactos/dll/cpl/desk/resource.h
reactos/dll/cpl/desk/sv.rc
reactos/dll/cpl/intl_new/En.rc
reactos/dll/cpl/intl_new/Fr.rc [new file with mode: 0644]
reactos/dll/cpl/intl_new/currency.c [new file with mode: 0644]
reactos/dll/cpl/intl_new/date.c [new file with mode: 0644]
reactos/dll/cpl/intl_new/extra.c
reactos/dll/cpl/intl_new/intl.c
reactos/dll/cpl/intl_new/intl.h
reactos/dll/cpl/intl_new/intl.rbuild
reactos/dll/cpl/intl_new/intl.rc
reactos/dll/cpl/intl_new/langs.c [new file with mode: 0644]
reactos/dll/cpl/intl_new/locale.c
reactos/dll/cpl/intl_new/nums.c [new file with mode: 0644]
reactos/dll/cpl/intl_new/resource.h
reactos/dll/cpl/intl_new/setupreg.c [new file with mode: 0644]
reactos/dll/cpl/intl_new/time.c [new file with mode: 0644]
reactos/dll/cpl/sysdm/Ja.rc
reactos/dll/cpl/sysdm/computer.c [deleted file]
reactos/dll/cpl/sysdm/custclicklink.c [deleted file]
reactos/dll/cpl/sysdm/cz.rc
reactos/dll/cpl/sysdm/de.rc
reactos/dll/cpl/sysdm/dk.rc
reactos/dll/cpl/sysdm/en.rc
reactos/dll/cpl/sysdm/environment.c
reactos/dll/cpl/sysdm/es.rc
reactos/dll/cpl/sysdm/fr.rc
reactos/dll/cpl/sysdm/general.c
reactos/dll/cpl/sysdm/hu.rc
reactos/dll/cpl/sysdm/manifest.xml [new file with mode: 0644]
reactos/dll/cpl/sysdm/nl.rc
reactos/dll/cpl/sysdm/precomp.h
reactos/dll/cpl/sysdm/resource.h
reactos/dll/cpl/sysdm/ru.rc
reactos/dll/cpl/sysdm/startrec.c
reactos/dll/cpl/sysdm/sv.rc
reactos/dll/cpl/sysdm/sysdm.c
reactos/dll/cpl/sysdm/sysdm.rbuild
reactos/dll/cpl/sysdm/sysdm.rc
reactos/dll/cpl/sysdm/uk.rc
reactos/dll/cpl/sysdm/userprofile.c
reactos/dll/cpl/sysdm/virtmem.c
reactos/dll/keyboard/kbdit/kbdit.c [new file with mode: 0644]
reactos/dll/keyboard/kbdit/kbdit.def [new file with mode: 0644]
reactos/dll/keyboard/kbdit/kbdit.rbuild [new file with mode: 0644]
reactos/dll/keyboard/kbdit/kbdit.rc [new file with mode: 0644]
reactos/dll/keyboard/keyboard.rbuild
reactos/dll/lib.mak [deleted file]
reactos/dll/ntdll/ldr/utils.c
reactos/dll/ntdll/ntdll.rbuild
reactos/dll/win32/acledit/acledit.def
reactos/dll/win32/aclui/checklist.c
reactos/dll/win32/aclui/misc.c
reactos/dll/win32/aclui/precomp.h
reactos/dll/win32/advapi32/sec/sid.c
reactos/dll/win32/advapi32/service/sctrl.c
reactos/dll/win32/avifil32/avifile_Uk.rc [new file with mode: 0644]
reactos/dll/win32/avifil32/rsrc.rc
reactos/dll/win32/beepmidi/beepmidi.c [new file with mode: 0644]
reactos/dll/win32/beepmidi/beepmidi.def [new file with mode: 0644]
reactos/dll/win32/beepmidi/beepmidi.rbuild [new file with mode: 0644]
reactos/dll/win32/beepmidi/readme.txt [new file with mode: 0644]
reactos/dll/win32/comdlg32/cdlg.h
reactos/dll/win32/comdlg32/cdlg32.c
reactos/dll/win32/comdlg32/colordlg.c
reactos/dll/win32/comdlg32/comdlg32.rbuild
reactos/dll/win32/comdlg32/comdlg32_ros.diff [new file with mode: 0644]
reactos/dll/win32/comdlg32/filedlg.c
reactos/dll/win32/comdlg32/filedlg31.c
reactos/dll/win32/comdlg32/filedlgbrowser.c
reactos/dll/win32/comdlg32/filetitle.c
reactos/dll/win32/comdlg32/finddlg32.c
reactos/dll/win32/comdlg32/fontdlg.c
reactos/dll/win32/comdlg32/precomp.h [new file with mode: 0644]
reactos/dll/win32/comdlg32/printdlg.c
reactos/dll/win32/dbghelp/msc.c
reactos/dll/win32/dbghelp/stack.c
reactos/dll/win32/iphlpapi/iphlpapi_private.h
reactos/dll/win32/kernel32/file/cnotify.c
reactos/dll/win32/kernel32/file/create.c
reactos/dll/win32/kernel32/file/dir.c
reactos/dll/win32/kernel32/file/dosdev.c
reactos/dll/win32/kernel32/file/file.c
reactos/dll/win32/kernel32/file/find.c
reactos/dll/win32/kernel32/file/lock.c
reactos/dll/win32/kernel32/file/npipe.c
reactos/dll/win32/kernel32/file/volume.c
reactos/dll/win32/kernel32/include/debug.h
reactos/dll/win32/kernel32/include/kernel32.h
reactos/dll/win32/kernel32/k32.h
reactos/dll/win32/kernel32/kernel32.rbuild
reactos/dll/win32/kernel32/mem/global.c
reactos/dll/win32/kernel32/mem/heap.c
reactos/dll/win32/kernel32/misc/actctx.c
reactos/dll/win32/kernel32/misc/comm.c
reactos/dll/win32/kernel32/misc/computername.c
reactos/dll/win32/kernel32/misc/console.c
reactos/dll/win32/kernel32/misc/dllmain.c
reactos/dll/win32/kernel32/misc/env.c
reactos/dll/win32/kernel32/misc/errormsg.c
reactos/dll/win32/kernel32/misc/lang.c
reactos/dll/win32/kernel32/misc/lcformat.c
reactos/dll/win32/kernel32/misc/ldr.c
reactos/dll/win32/kernel32/misc/lzexpand_main.c
reactos/dll/win32/kernel32/misc/nls.c
reactos/dll/win32/kernel32/misc/profile.c
reactos/dll/win32/kernel32/misc/recovery.c
reactos/dll/win32/kernel32/misc/stubs.c
reactos/dll/win32/kernel32/nls/ukr.nls
reactos/dll/win32/kernel32/process/proc.c
reactos/dll/win32/kernel32/process/procsup.c [moved from reactos/dll/win32/kernel32/process/create.c with 99% similarity]
reactos/dll/win32/kernel32/string/lstring.c
reactos/dll/win32/kernel32/synch/condvar.c
reactos/dll/win32/kernel32/synch/event.c
reactos/dll/win32/kernel32/synch/mutex.c
reactos/dll/win32/kernel32/synch/sem.c
reactos/dll/win32/kernel32/synch/timer.c
reactos/dll/win32/kernel32/synch/wait.c
reactos/dll/win32/kernel32/thread/thread.c
reactos/dll/win32/msacm/msacm.rc
reactos/dll/win32/msacm/msacm_Uk.rc [new file with mode: 0644]
reactos/dll/win32/msacm/msacm_ros.diff [new file with mode: 0644]
reactos/dll/win32/msgina/gui.c
reactos/dll/win32/msgina/stubs.c
reactos/dll/win32/msgina/tui.c
reactos/dll/win32/netid/lang/de-DE.rc [new file with mode: 0644]
reactos/dll/win32/netid/lang/en-US.rc [new file with mode: 0644]
reactos/dll/win32/netid/netid.c [new file with mode: 0644]
reactos/dll/win32/netid/netid.rbuild [new file with mode: 0644]
reactos/dll/win32/netid/netid.rc [new file with mode: 0644]
reactos/dll/win32/netid/netid.spec [new file with mode: 0644]
reactos/dll/win32/netid/res/netid.ico [new file with mode: 0644]
reactos/dll/win32/netid/resource.h [new file with mode: 0644]
reactos/dll/win32/newdev/newdev.c
reactos/dll/win32/oledlg/oledlg_Uk.rc [new file with mode: 0644]
reactos/dll/win32/oledlg/oledlg_ros.diff [new file with mode: 0644]
reactos/dll/win32/oledlg/rsrc.rc
reactos/dll/win32/opengl32/opengl32.h
reactos/dll/win32/riched20/editor.c
reactos/dll/win32/setupapi/parser.c
reactos/dll/win32/setupapi/res/lang/It.rc
reactos/dll/win32/shdocvw/Uk.rc [new file with mode: 0644]
reactos/dll/win32/shdocvw/shdocvw.rc
reactos/dll/win32/shdocvw/shdocvw_ros.diff [new file with mode: 0644]
reactos/dll/win32/shell32/shellord.c
reactos/dll/win32/shlwapi/shlwapi.rc
reactos/dll/win32/shlwapi/shlwapi_Uk.rc [new file with mode: 0644]
reactos/dll/win32/shlwapi/shlwapi_ros.diff [new file with mode: 0644]
reactos/dll/win32/user32/misc/desktop.c
reactos/dll/win32/user32/windows/accel.c
reactos/dll/win32/user32/windows/bitmap.c
reactos/dll/win32/user32/windows/draw.c
reactos/dll/win32/user32/windows/input.c
reactos/dll/win32/usp10/usp10.c [new file with mode: 0644]
reactos/dll/win32/usp10/usp10.rbuild [new file with mode: 0644]
reactos/dll/win32/usp10/usp10.spec [new file with mode: 0644]
reactos/dll/win32/usp10/usp10_ros.diff [new file with mode: 0644]
reactos/dll/win32/version/info.c
reactos/dll/win32/win32.rbuild
reactos/dll/win32/winmm/wavemap/wavemap.rbuild
reactos/dll/win32/winmm/winemm.h
reactos/drivers/base/beep/beep.c
reactos/drivers/base/bootvid/bootdata.c [new file with mode: 0644]
reactos/drivers/base/bootvid/bootimage.bmp [deleted file]
reactos/drivers/base/bootvid/bootvid.c
reactos/drivers/base/bootvid/bootvid.def
reactos/drivers/base/bootvid/bootvid.h [deleted file]
reactos/drivers/base/bootvid/bootvid.rbuild
reactos/drivers/base/bootvid/bootvid.rc
reactos/drivers/base/bootvid/precomp.h [new file with mode: 0644]
reactos/drivers/base/bootvid/resource.h [deleted file]
reactos/drivers/base/bootvid/vga.c [new file with mode: 0644]
reactos/drivers/base/bootvid/vid.c [deleted file]
reactos/drivers/base/bootvid/vid_vga.c [deleted file]
reactos/drivers/base/bootvid/vid_vgatext.c [deleted file]
reactos/drivers/base/bootvid/vid_xbox.c [deleted file]
reactos/drivers/base/green/createclose.c
reactos/drivers/base/green/green.h
reactos/drivers/drivers.rbuild
reactos/drivers/network/dd/ne2000/include/ne2000.h
reactos/drivers/network/tcpip/tcpip/proto.c
reactos/drivers/network/wshtcpip/wshtcpip.def
reactos/drivers/test/kmtest/ntos_ob.c
reactos/drivers/video/videoprt/videoprt.h
reactos/drivers/wmi/wmilib.c [new file with mode: 0644]
reactos/drivers/wmi/wmilib.def [new file with mode: 0644]
reactos/drivers/wmi/wmilib.rbuild [new file with mode: 0644]
reactos/drivers/wmi/wmilib.rc [new file with mode: 0644]
reactos/hal/hal/hal.c
reactos/hal/halx86/generic/bus.c
reactos/hal/halx86/generic/halinit.c
reactos/hal/halx86/generic/misc.c
reactos/hal/halx86/include/hal.h
reactos/hal/halx86/mp/halinit.c
reactos/include/ddk/ndis.h
reactos/include/ddk/ntddft.h [new file with mode: 0644]
reactos/include/ddk/ntifs.h
reactos/include/ddk/winddk.h
reactos/include/ndk/asm.h
reactos/include/ndk/cctypes.h
reactos/include/ndk/exfuncs.h
reactos/include/ndk/extypes.h
reactos/include/ndk/inbvfuncs.h
reactos/include/ndk/inbvtypes.h [new file with mode: 0644]
reactos/include/ndk/iotypes.h
reactos/include/ndk/kdtypes.h
reactos/include/ndk/ketypes.h
reactos/include/ndk/ntndk.h
reactos/include/ndk/obfuncs.h
reactos/include/ndk/obtypes.h
reactos/include/ndk/rtlfuncs.h
reactos/include/psdk/intrin.h
reactos/include/psdk/shlobj.h
reactos/include/psdk/usp10.h [new file with mode: 0644]
reactos/include/psdk/winbase.h
reactos/include/psdk/windef.h
reactos/include/psdk/windns.h
reactos/include/psdk/winnt.h
reactos/include/psdk/winuser.h
reactos/include/reactos/drivers/bootvid/bootvid.h [new file with mode: 0644]
reactos/include/reactos/version.h
reactos/include/reactos/wine/commdlg.h
reactos/include/reactos/wine/debug.h
reactos/include/reactos/wine/dlgs.h
reactos/include/reactos/wine/objbase.h
reactos/include/reactos/wine/shellapi.h
reactos/include/reactos/wine/shlguid.h
reactos/include/reactos/wine/shlobj.h
reactos/include/reactos/wine/shlwapi.h
reactos/include/reactos/wine/windef.h
reactos/include/reactos/wine/wingdi.h
reactos/include/reactos/wine/winuser.h
reactos/lib/3rdparty/expat/Changes [deleted file]
reactos/lib/3rdparty/expat/MANIFEST [deleted file]
reactos/lib/3rdparty/expat/bcb5/README.txt [deleted file]
reactos/lib/3rdparty/expat/bcb5/all_projects.bpg [deleted file]
reactos/lib/3rdparty/expat/bcb5/elements.bpf [deleted file]
reactos/lib/3rdparty/expat/bcb5/elements.bpr [deleted file]
reactos/lib/3rdparty/expat/bcb5/elements.mak [deleted file]
reactos/lib/3rdparty/expat/bcb5/expat.bpf [deleted file]
reactos/lib/3rdparty/expat/bcb5/expat.bpr [deleted file]
reactos/lib/3rdparty/expat/bcb5/expat.mak [deleted file]
reactos/lib/3rdparty/expat/bcb5/expat_static.bpf [deleted file]
reactos/lib/3rdparty/expat/bcb5/expat_static.bpr [deleted file]
reactos/lib/3rdparty/expat/bcb5/expat_static.mak [deleted file]
reactos/lib/3rdparty/expat/bcb5/expatw.bpf [deleted file]
reactos/lib/3rdparty/expat/bcb5/expatw.bpr [deleted file]
reactos/lib/3rdparty/expat/bcb5/expatw.mak [deleted file]
reactos/lib/3rdparty/expat/bcb5/expatw_static.bpf [deleted file]
reactos/lib/3rdparty/expat/bcb5/expatw_static.bpr [deleted file]
reactos/lib/3rdparty/expat/bcb5/expatw_static.mak [deleted file]
reactos/lib/3rdparty/expat/bcb5/libexpat_mtd.def [deleted file]
reactos/lib/3rdparty/expat/bcb5/libexpatw_mtd.def [deleted file]
reactos/lib/3rdparty/expat/bcb5/makefile.mak [deleted file]
reactos/lib/3rdparty/expat/bcb5/outline.bpf [deleted file]
reactos/lib/3rdparty/expat/bcb5/outline.bpr [deleted file]
reactos/lib/3rdparty/expat/bcb5/outline.mak [deleted file]
reactos/lib/3rdparty/expat/bcb5/setup.bat [deleted file]
reactos/lib/3rdparty/expat/bcb5/xmlwf.bpf [deleted file]
reactos/lib/3rdparty/expat/bcb5/xmlwf.bpr [deleted file]
reactos/lib/3rdparty/expat/bcb5/xmlwf.mak [deleted file]
reactos/lib/3rdparty/expat/buildconf.sh [deleted file]
reactos/lib/3rdparty/expat/configure.in [deleted file]
reactos/lib/3rdparty/expat/conftools/PrintPath [deleted file]
reactos/lib/3rdparty/expat/conftools/ac_c_bigendian_cross.m4 [deleted file]
reactos/lib/3rdparty/expat/conftools/config.guess [deleted file]
reactos/lib/3rdparty/expat/conftools/config.sub [deleted file]
reactos/lib/3rdparty/expat/conftools/expat.m4 [deleted file]
reactos/lib/3rdparty/expat/conftools/get-version.sh [deleted file]
reactos/lib/3rdparty/expat/conftools/install-sh [deleted file]
reactos/lib/3rdparty/expat/conftools/mkinstalldirs [deleted file]
reactos/lib/3rdparty/expat/doc/expat.png [deleted file]
reactos/lib/3rdparty/expat/doc/reference.html [deleted file]
reactos/lib/3rdparty/expat/doc/style.css [deleted file]
reactos/lib/3rdparty/expat/doc/valid-xhtml10.png [deleted file]
reactos/lib/3rdparty/expat/doc/xmlwf.1 [deleted file]
reactos/lib/3rdparty/expat/doc/xmlwf.sgml [deleted file]
reactos/lib/3rdparty/expat/examples/elements.c [deleted file]
reactos/lib/3rdparty/expat/examples/elements.dsp [deleted file]
reactos/lib/3rdparty/expat/examples/elements.vcproj [deleted file]
reactos/lib/3rdparty/expat/examples/outline.c [deleted file]
reactos/lib/3rdparty/expat/examples/outline.dsp [deleted file]
reactos/lib/3rdparty/expat/examples/outline.vcproj [deleted file]
reactos/lib/3rdparty/expat/examples/poem.rbuild [deleted file]
reactos/lib/3rdparty/expat/expat.rbuild
reactos/lib/3rdparty/expat/gennmtab/gennmtab.c [deleted file]
reactos/lib/3rdparty/expat/gennmtab/gennmtab.dsp [deleted file]
reactos/lib/3rdparty/expat/make-release.sh [deleted file]
reactos/lib/3rdparty/expat/tests/README.txt [deleted file]
reactos/lib/3rdparty/expat/tests/benchmark/README.txt [deleted file]
reactos/lib/3rdparty/expat/tests/benchmark/benchmark.c [deleted file]
reactos/lib/3rdparty/expat/tests/benchmark/benchmark.dsp [deleted file]
reactos/lib/3rdparty/expat/tests/benchmark/benchmark.dsw [deleted file]
reactos/lib/3rdparty/expat/tests/chardata.c [deleted file]
reactos/lib/3rdparty/expat/tests/chardata.h [deleted file]
reactos/lib/3rdparty/expat/tests/minicheck.c [deleted file]
reactos/lib/3rdparty/expat/tests/minicheck.h [deleted file]
reactos/lib/3rdparty/expat/tests/runtests.c [deleted file]
reactos/lib/3rdparty/expat/tests/runtestspp.cpp [deleted file]
reactos/lib/3rdparty/expat/tests/xmltest.sh [deleted file]
reactos/lib/3rdparty/expat/vms/README.vms [deleted file]
reactos/lib/3rdparty/expat/vms/descrip.mms [deleted file]
reactos/lib/3rdparty/expat/vms/expat_config.h [deleted file]
reactos/lib/3rdparty/expat/win32/MANIFEST.txt [deleted file]
reactos/lib/3rdparty/expat/win32/README.txt [deleted file]
reactos/lib/3rdparty/expat/win32/expat.iss [deleted file]
reactos/lib/3rdparty/expat/xmlwf/codepage.c [deleted file]
reactos/lib/3rdparty/expat/xmlwf/codepage.h [deleted file]
reactos/lib/3rdparty/expat/xmlwf/ct.c [deleted file]
reactos/lib/3rdparty/expat/xmlwf/filemap.h [deleted file]
reactos/lib/3rdparty/expat/xmlwf/readfilemap.c [deleted file]
reactos/lib/3rdparty/expat/xmlwf/unixfilemap.c [deleted file]
reactos/lib/3rdparty/expat/xmlwf/win32filemap.c [deleted file]
reactos/lib/3rdparty/expat/xmlwf/xmlfile.c [deleted file]
reactos/lib/3rdparty/expat/xmlwf/xmlfile.h [deleted file]
reactos/lib/3rdparty/expat/xmlwf/xmlmime.c [deleted file]
reactos/lib/3rdparty/expat/xmlwf/xmlmime.h [deleted file]
reactos/lib/3rdparty/expat/xmlwf/xmltchar.h [deleted file]
reactos/lib/3rdparty/expat/xmlwf/xmlurl.h [deleted file]
reactos/lib/3rdparty/expat/xmlwf/xmlwf.c [deleted file]
reactos/lib/3rdparty/expat/xmlwf/xmlwf.dsp [deleted file]
reactos/lib/3rdparty/expat/xmlwf/xmlwf.vcproj [deleted file]
reactos/lib/3rdparty/expat/xmlwf/xmlwin32url.cxx [deleted file]
reactos/lib/crt/locale/locale.c
reactos/lib/intrlck/i386/compareexchange.c
reactos/lib/intrlck/i386/decrement.c
reactos/lib/intrlck/i386/exchange.c
reactos/lib/intrlck/i386/exchangeadd.c
reactos/lib/intrlck/i386/increment.c
reactos/lib/mingw/mingw.rbuild
reactos/lib/rtl/austin/udict.h
reactos/lib/rtl/critical.c
reactos/lib/rtl/debug.c
reactos/lib/rtl/heap.c
reactos/lib/rtl/i386/debug_asm.S
reactos/lib/rtl/i386/thread.c [new file with mode: 0644]
reactos/lib/rtl/nls.c
reactos/lib/rtl/rtl.h
reactos/lib/rtl/rtl.rbuild
reactos/lib/rtl/rtlp.h
reactos/lib/rtl/sid.c
reactos/lib/rtl/srw.c
reactos/lib/rtl/thread.c
reactos/lib/rtl/workitem.c
reactos/lib/string/sscanf.c
reactos/lib/string/wtoi.c
reactos/media/fonts/DejaVuSans-Bold.ttf
reactos/media/fonts/DejaVuSans-BoldOblique.ttf
reactos/media/fonts/DejaVuSans-ExtraLight.ttf
reactos/media/fonts/DejaVuSans-Oblique.ttf
reactos/media/fonts/DejaVuSans.ttf
reactos/media/fonts/DejaVuSansCondensed-Bold.ttf
reactos/media/fonts/DejaVuSansCondensed-BoldOblique.ttf
reactos/media/fonts/DejaVuSansCondensed-Oblique.ttf
reactos/media/fonts/DejaVuSansCondensed.ttf
reactos/media/fonts/DejaVuSansMono-Bold.ttf
reactos/media/fonts/DejaVuSansMono-BoldOblique.ttf
reactos/media/fonts/DejaVuSansMono-Oblique.ttf
reactos/media/fonts/DejaVuSansMono.ttf
reactos/media/fonts/DejaVuSerif-Bold.ttf
reactos/media/fonts/DejaVuSerif-BoldOblique.ttf
reactos/media/fonts/DejaVuSerif-Oblique.ttf
reactos/media/fonts/DejaVuSerif.ttf
reactos/media/fonts/DejaVuSerifCondensed-Bold.ttf
reactos/media/fonts/DejaVuSerifCondensed-BoldOblique.ttf
reactos/media/fonts/DejaVuSerifCondensed-Oblique.ttf
reactos/media/fonts/DejaVuSerifCondensed.ttf
reactos/media/fonts/Marlett.ttf [new file with mode: 0644]
reactos/media/fonts/TGMarlett.ttf [deleted file]
reactos/media/fonts/doc/DejaVu_AUTHORS.txt
reactos/media/fonts/doc/DejaVu_NEWS.txt
reactos/media/fonts/doc/DejaVu_README.txt
reactos/media/fonts/doc/DejaVu_langcover.txt
reactos/media/fonts/doc/DejaVu_status.txt
reactos/media/fonts/doc/DejaVu_unicover.txt
reactos/media/fonts/fonts.rbuild
reactos/ntoskrnl/KrnlFun.c
reactos/ntoskrnl/cc/cacheman.c
reactos/ntoskrnl/cc/copy.c
reactos/ntoskrnl/cc/mdl.c
reactos/ntoskrnl/cm/ntfunc.c
reactos/ntoskrnl/cm/registry.c
reactos/ntoskrnl/cm/regobj.c
reactos/ntoskrnl/ex/callback.c
reactos/ntoskrnl/ex/handle.c
reactos/ntoskrnl/ex/init.c
reactos/ntoskrnl/ex/lookas.c
reactos/ntoskrnl/ex/power.c
reactos/ntoskrnl/ex/pushlock.c
reactos/ntoskrnl/ex/resource.c
reactos/ntoskrnl/ex/sysinfo.c
reactos/ntoskrnl/ex/time.c
reactos/ntoskrnl/ex/work.c
reactos/ntoskrnl/fs/context.c [deleted file]
reactos/ntoskrnl/fs/fastio.c [deleted file]
reactos/ntoskrnl/fs/filelock.c [deleted file]
reactos/ntoskrnl/fs/name.c [deleted file]
reactos/ntoskrnl/fs/notify.c [deleted file]
reactos/ntoskrnl/fs/pool.c [deleted file]
reactos/ntoskrnl/fs/util.c [deleted file]
reactos/ntoskrnl/fsrtl/dbcsname.c [new file with mode: 0644]
reactos/ntoskrnl/fsrtl/fastio.c [new file with mode: 0644]
reactos/ntoskrnl/fsrtl/faulttol.c [new file with mode: 0644]
reactos/ntoskrnl/fsrtl/filelock.c [new file with mode: 0644]
reactos/ntoskrnl/fsrtl/filter.c [new file with mode: 0644]
reactos/ntoskrnl/fsrtl/filtrctx.c [new file with mode: 0644]
reactos/ntoskrnl/fsrtl/fsfilter.c [new file with mode: 0644]
reactos/ntoskrnl/fsrtl/fsrtlpc.c [new file with mode: 0644]
reactos/ntoskrnl/fsrtl/largemcb.c [moved from reactos/ntoskrnl/fs/mcb.c with 62% similarity]
reactos/ntoskrnl/fsrtl/name.c [new file with mode: 0644]
reactos/ntoskrnl/fsrtl/notify.c [new file with mode: 0644]
reactos/ntoskrnl/fsrtl/oplock.c [moved from reactos/ntoskrnl/fs/oplock.c with 75% similarity]
reactos/ntoskrnl/fsrtl/pnp.c [new file with mode: 0644]
reactos/ntoskrnl/fsrtl/stackovf.c [new file with mode: 0644]
reactos/ntoskrnl/fsrtl/tunnel.c [moved from reactos/ntoskrnl/fs/tunnel.c with 57% similarity]
reactos/ntoskrnl/fsrtl/unc.c [moved from reactos/ntoskrnl/fs/unc.c with 66% similarity]
reactos/ntoskrnl/inbv/inbv.c
reactos/ntoskrnl/inbv/logo/1.bmp [new file with mode: 0644]
reactos/ntoskrnl/inbv/logo/13.bmp [new file with mode: 0644]
reactos/ntoskrnl/inbv/logo/14.bmp [new file with mode: 0644]
reactos/ntoskrnl/inbv/logo/15.bmp [new file with mode: 0644]
reactos/ntoskrnl/inbv/logo/16.bmp [new file with mode: 0644]
reactos/ntoskrnl/inbv/logo/17.bmp [new file with mode: 0644]
reactos/ntoskrnl/inbv/logo/2.bmp [new file with mode: 0644]
reactos/ntoskrnl/inbv/logo/3.bmp [new file with mode: 0644]
reactos/ntoskrnl/inbv/logo/4.bmp [moved from reactos/drivers/base/bootvid/bar.bmp with 100% similarity]
reactos/ntoskrnl/inbv/logo/5.bmp [new file with mode: 0644]
reactos/ntoskrnl/inbv/logo/6.bmp [new file with mode: 0644]
reactos/ntoskrnl/inbv/logo/7.bmp [new file with mode: 0644]
reactos/ntoskrnl/inbv/logo/8.bmp [new file with mode: 0644]
reactos/ntoskrnl/include/internal/cc.h
reactos/ntoskrnl/include/internal/ex.h
reactos/ntoskrnl/include/internal/fsrtl.h
reactos/ntoskrnl/include/internal/i386/ke.h
reactos/ntoskrnl/include/internal/inbv.h
reactos/ntoskrnl/include/internal/io.h
reactos/ntoskrnl/include/internal/kd.h
reactos/ntoskrnl/include/internal/ke.h
reactos/ntoskrnl/include/internal/ke_x.h
reactos/ntoskrnl/include/internal/lpc.h
reactos/ntoskrnl/include/internal/lpc_x.h [moved from reactos/ntoskrnl/lpc/ntlpc/lpc_x.h with 76% similarity]
reactos/ntoskrnl/include/internal/mm.h
reactos/ntoskrnl/include/internal/ntoskrnl.h
reactos/ntoskrnl/include/internal/ob.h
reactos/ntoskrnl/include/internal/ob_x.h
reactos/ntoskrnl/include/internal/po.h
reactos/ntoskrnl/include/internal/ps.h
reactos/ntoskrnl/include/internal/ps_x.h
reactos/ntoskrnl/include/ntoskrnl.h
reactos/ntoskrnl/io/iomgr/controller.c
reactos/ntoskrnl/io/iomgr/deviface.c
reactos/ntoskrnl/io/iomgr/driver.c
reactos/ntoskrnl/io/iomgr/file.c
reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
reactos/ntoskrnl/kd/kdmain.c
reactos/ntoskrnl/ke/apc.c
reactos/ntoskrnl/ke/balmgr.c [new file with mode: 0644]
reactos/ntoskrnl/ke/clock.c
reactos/ntoskrnl/ke/dpc.c
reactos/ntoskrnl/ke/event.c
reactos/ntoskrnl/ke/freeldr.c
reactos/ntoskrnl/ke/gate.c
reactos/ntoskrnl/ke/gmutex.c
reactos/ntoskrnl/ke/i386/clock.S
reactos/ntoskrnl/ke/i386/cpu.c
reactos/ntoskrnl/ke/i386/ctxswitch.S
reactos/ntoskrnl/ke/i386/kiinit.c
reactos/ntoskrnl/ke/i386/patpge.c
reactos/ntoskrnl/ke/i386/thread.c
reactos/ntoskrnl/ke/i386/trap.s
reactos/ntoskrnl/ke/krnlinit.c
reactos/ntoskrnl/ke/process.c
reactos/ntoskrnl/ke/queue.c
reactos/ntoskrnl/ke/thrdobj.c
reactos/ntoskrnl/ke/thrdschd.c
reactos/ntoskrnl/ke/timer.c
reactos/ntoskrnl/ke/wait.c
reactos/ntoskrnl/lpc/close.c
reactos/ntoskrnl/lpc/complete.c
reactos/ntoskrnl/lpc/connect.c
reactos/ntoskrnl/lpc/create.c
reactos/ntoskrnl/lpc/listen.c
reactos/ntoskrnl/lpc/ntlpc/close.c [deleted file]
reactos/ntoskrnl/lpc/ntlpc/complete.c [deleted file]
reactos/ntoskrnl/lpc/ntlpc/connect.c [deleted file]
reactos/ntoskrnl/lpc/ntlpc/create.c [deleted file]
reactos/ntoskrnl/lpc/ntlpc/listen.c [deleted file]
reactos/ntoskrnl/lpc/ntlpc/lpc.h [deleted file]
reactos/ntoskrnl/lpc/ntlpc/port.c [deleted file]
reactos/ntoskrnl/lpc/ntlpc/reply.c [deleted file]
reactos/ntoskrnl/lpc/ntlpc/send.c [deleted file]
reactos/ntoskrnl/lpc/port.c
reactos/ntoskrnl/lpc/query.c [deleted file]
reactos/ntoskrnl/lpc/queue.c [deleted file]
reactos/ntoskrnl/lpc/receive.c [deleted file]
reactos/ntoskrnl/lpc/reply.c
reactos/ntoskrnl/lpc/send.c
reactos/ntoskrnl/mm/balance.c
reactos/ntoskrnl/mm/freelist.c
reactos/ntoskrnl/mm/mdl.c
reactos/ntoskrnl/mm/mminit.c
reactos/ntoskrnl/mm/mpw.c
reactos/ntoskrnl/mm/npool.c
reactos/ntoskrnl/mm/pagefile.c
reactos/ntoskrnl/mm/pageop.c
reactos/ntoskrnl/mm/rmap.c
reactos/ntoskrnl/mm/section.c
reactos/ntoskrnl/ntoskrnl.def
reactos/ntoskrnl/ntoskrnl.mc
reactos/ntoskrnl/ntoskrnl.rbuild
reactos/ntoskrnl/ntoskrnl.rc
reactos/ntoskrnl/ob/obdir.c
reactos/ntoskrnl/ob/obhandle.c
reactos/ntoskrnl/ob/obinit.c
reactos/ntoskrnl/ob/oblife.c
reactos/ntoskrnl/ob/obname.c
reactos/ntoskrnl/ob/obref.c
reactos/ntoskrnl/ob/obsecure.c
reactos/ntoskrnl/ob/obwait.c
reactos/ntoskrnl/ob/symlink.c
reactos/ntoskrnl/po/power.c
reactos/ntoskrnl/ps/kill.c
reactos/ntoskrnl/ps/notify.c
reactos/ntoskrnl/ps/process.c
reactos/ntoskrnl/ps/psmgr.c
reactos/ntoskrnl/ps/query.c
reactos/ntoskrnl/ps/security.c
reactos/ntoskrnl/ps/thread.c
reactos/ntoskrnl/rtl/libsupp.c
reactos/ntoskrnl/se/semgr.c
reactos/ntoskrnl/se/token.c
reactos/ntoskrnl/tests/fsrtl.c [new file with mode: 0644]
reactos/ntoskrnl/vdm/vdmexec.c
reactos/regress_greatlord.rtf [deleted file]
reactos/regtests/shared/regtests.h
reactos/regtests/winetests/directory.rbuild
reactos/regtests/winetests/kernel32/thread.c
reactos/regtests/winetests/user32/edit.c
reactos/regtests/winetests/usp10/.gitignore [deleted file]
reactos/subsystems/win32/csrss/api/handle.c
reactos/subsystems/win32/csrss/api/wapi.c
reactos/subsystems/win32/csrss/csrss.c
reactos/subsystems/win32/csrss/csrss.h
reactos/subsystems/win32/csrss/csrss.rbuild
reactos/subsystems/win32/csrss/init.c
reactos/subsystems/win32/csrss/win32csr/guiconsole.c
reactos/subsystems/win32/win32k/include/object.h
reactos/subsystems/win32/win32k/ntuser/cursoricon.c
reactos/subsystems/win32/win32k/ntuser/desktop.c
reactos/subsystems/win32/win32k/ntuser/misc.c
reactos/subsystems/win32/win32k/objects/arc.c [new file with mode: 0644]
reactos/subsystems/win32/win32k/objects/print.c
reactos/tools/pefixup.c
reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp
reactos/tools/rbuild/backend/devcpp/devcpp.cpp
reactos/tools/rbuild/backend/mingw/mingw.cpp
reactos/tools/rbuild/backend/mingw/modulehandler.cpp
reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
reactos/tools/rbuild/bootstrap.cpp
reactos/tools/rbuild/doc/rbuild.dbk
reactos/tools/rbuild/doc/rbuild.txt
reactos/tools/rbuild/global.cpp
reactos/tools/rbuild/module.cpp
reactos/tools/rbuild/project.cpp
reactos/tools/rbuild/rbuild.cpp
reactos/tools/rbuild/syssetupgenerator.cpp
reactos/tools/rbuild/testsupportcode.cpp
reactos/tools/rgenstat/web/rapistatus.xsl
reactos/tools/sysreg/file_reader.cpp
reactos/tools/sysreg/namedpipe_reader.cpp
reactos/tools/sysreg/namedpipe_reader.h
reactos/tools/sysreg/rosboot_test.cpp
reactos/tools/sysreg/rosboot_test.h
reactos/tools/sysreg/sysreg.mak
reactos/tools/tools.mak
reactos/tools/wrc/newstruc.c
rosapps/devutils/cputointel/AnyalsingProcess.c [new file with mode: 0644]
rosapps/devutils/cputointel/ConvertToIA32Process.c [new file with mode: 0644]
rosapps/devutils/cputointel/ConvertToPPCProcess.c [new file with mode: 0644]
rosapps/devutils/cputointel/ConvertingProcess.c [new file with mode: 0644]
rosapps/devutils/cputointel/CpuToIntel.c
rosapps/devutils/cputointel/From/ARM/ARM.h [new file with mode: 0644]
rosapps/devutils/cputointel/From/ARM/ARMBrain.c [new file with mode: 0644]
rosapps/devutils/cputointel/From/ARM/ARMBrain.h [moved from rosapps/devutils/cputointel/PPC/PPCBrain.h with 74% similarity]
rosapps/devutils/cputointel/From/ARM/ARMopcode.c [moved from rosapps/devutils/cputointel/PPC/PPCopcode.c with 67% similarity]
rosapps/devutils/cputointel/From/IA32/IA32.h [moved from rosapps/devutils/cputointel/PPC/PPC.h with 78% similarity]
rosapps/devutils/cputointel/From/IA32/IA32Brain.c [new file with mode: 0644]
rosapps/devutils/cputointel/From/IA32/IA32Brain.h [new file with mode: 0644]
rosapps/devutils/cputointel/From/IA32/IA32opcode.c [new file with mode: 0644]
rosapps/devutils/cputointel/From/PPC/PPC.h [new file with mode: 0644]
rosapps/devutils/cputointel/From/PPC/PPCBrain.c [new file with mode: 0644]
rosapps/devutils/cputointel/From/PPC/PPCBrain.h [new file with mode: 0644]
rosapps/devutils/cputointel/From/PPC/PPCopcode.c [new file with mode: 0644]
rosapps/devutils/cputointel/From/dummycpu/Dummy.h [moved from rosapps/devutils/cputointel/dummycpu/Dummy.h with 96% similarity]
rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c [moved from rosapps/devutils/cputointel/dummycpu/DummyBrain.c with 52% similarity]
rosapps/devutils/cputointel/From/dummycpu/DummyBrain.h [moved from rosapps/devutils/cputointel/dummycpu/DummyBrain.h with 94% similarity]
rosapps/devutils/cputointel/From/dummycpu/Dummyopcode.c [moved from rosapps/devutils/cputointel/dummycpu/Dummyopcode.c with 98% similarity]
rosapps/devutils/cputointel/From/m68k/M68kBrain.c [moved from rosapps/devutils/cputointel/m68k/M68kBrain.c with 89% similarity]
rosapps/devutils/cputointel/From/m68k/M68kBrain.h [moved from rosapps/devutils/cputointel/m68k/M68kBrain.h with 98% similarity]
rosapps/devutils/cputointel/From/m68k/M68kopcode.c [moved from rosapps/devutils/cputointel/m68k/M68kopcode.c with 100% similarity]
rosapps/devutils/cputointel/From/m68k/m68k.h [moved from rosapps/devutils/cputointel/m68k/m68k.h with 99% similarity]
rosapps/devutils/cputointel/ImageLoader.c [new file with mode: 0644]
rosapps/devutils/cputointel/OpCodePPC.txt [new file with mode: 0644]
rosapps/devutils/cputointel/PPC/PPCBrain.c [deleted file]
rosapps/devutils/cputointel/ReadMe.txt [new file with mode: 0644]
rosapps/devutils/cputointel/any_op.h [new file with mode: 0644]
rosapps/devutils/cputointel/cputointel.rbuild
rosapps/devutils/cputointel/misc.c
rosapps/devutils/cputointel/misc.h
rosapps/devutils/gdihv/gdi.h [new file with mode: 0644]
rosapps/devutils/gdihv/gdihv.c [new file with mode: 0644]
rosapps/devutils/gdihv/gdihv.cbp [new file with mode: 0644]
rosapps/devutils/gdihv/gdihv.h [new file with mode: 0644]
rosapps/devutils/gdihv/gdihv.rbuild [new file with mode: 0644]
rosapps/devutils/gdihv/gdihv.rc [new file with mode: 0644]
rosapps/devutils/gdihv/handlelist.c [new file with mode: 0644]
rosapps/devutils/gdihv/handlelist.h [new file with mode: 0644]
rosapps/devutils/gdihv/mainwnd.c [new file with mode: 0644]
rosapps/devutils/gdihv/mainwnd.h [new file with mode: 0644]
rosapps/devutils/gdihv/proclist.c [new file with mode: 0644]
rosapps/devutils/gdihv/proclist.h [new file with mode: 0644]
rosapps/devutils/gdihv/resource.h [new file with mode: 0644]
rosapps/devutils/gdihv/system.ico [new file with mode: 0644]
rosapps/directory.rbuild
rosapps/tests/Imagelistviewer/imagelistviewer.rbuild
rosapps/tests/directory.rbuild

index 294ae80..d04d828 100644 (file)
@@ -274,45 +274,48 @@ endif
        cp = $(Q)cp
        NUL = /dev/null
 else # mingw32-windows
-  ifeq ($(OSTYPE),msys)
-       HOST=mingw32-linux
-       export EXEPREFIX = ./
-       export EXEPOSTFIX = .exe
-       export SEP = /
-       mkdir = -$(Q)mkdir -p
-       gcc = $(Q)gcc
-       gpp = $(Q)g++
-       ld = $(Q)ld
-       nm = $(Q)nm
-       objdump = $(Q)objdump
-       ar = $(Q)ar
-       objcopy = $(Q)objcopy
-       dlltool = $(Q)dlltool
-       strip = $(Q)strip
-       windres = $(Q)windres
-       rm = $(Q)rm -f
-       cp = $(Q)cp
-       NUL = /dev/null
-  else
-       export EXEPREFIX =
-       export EXEPOSTFIX = .exe
-       ROS_EMPTY =
-       export SEP = \$(ROS_EMPTY)
-       mkdir = -$(Q)mkdir
-       gcc = $(Q)gcc
-       gpp = $(Q)g++
-       ld = $(Q)ld
-       nm = $(Q)nm
-       objdump = $(Q)objdump
-       ar = $(Q)ar
-       objcopy = $(Q)objcopy
-       dlltool = $(Q)dlltool
-       strip = $(Q)strip
-       windres = $(Q)windres
-       rm = $(Q)del /f /q
-       cp = $(Q)copy /y
-       NUL = NUL
-  endif
+       ifeq ($(OSTYPE),msys)
+               HOST=mingw32-linux
+               export EXEPREFIX = ./
+               export EXEPOSTFIX = .exe
+               export SEP = /
+               mkdir = -$(Q)mkdir -p
+               rm = $(Q)rm -f
+               cp = $(Q)cp
+               NUL = /dev/null
+       else
+               export EXEPREFIX =
+               export EXEPOSTFIX = .exe
+               ROS_EMPTY =
+               export SEP = \$(ROS_EMPTY)
+               mkdir = -$(Q)mkdir
+               rm = $(Q)del /f /q
+               cp = $(Q)copy /y
+               NUL = NUL
+       endif
+       ifeq ($(ROS_PREFIX),)
+               gcc = $(Q)gcc
+               gpp = $(Q)g++
+               ld = $(Q)ld
+               nm = $(Q)nm
+               objdump = $(Q)objdump
+               ar = $(Q)ar
+               objcopy = $(Q)objcopy
+               dlltool = $(Q)dlltool
+               strip = $(Q)strip
+               windres = $(Q)windres
+       else
+               gcc = $(ROS_PREFIX)-gcc
+               gpp = $(Q)$(ROS_PREFIX)-g++
+               ld = $(Q)$(ROS_PREFIX)-ld
+               nm = $(Q)$(ROS_PREFIX)-nm
+               objdump = $(Q)$(ROS_PREFIX)-objdump
+               ar = $(Q)$(ROS_PREFIX)-ar
+               objcopy = $(Q)$(ROS_PREFIX)-objcopy
+               dlltool = $(Q)$(ROS_PREFIX)-dlltool
+               strip = $(Q)$(ROS_PREFIX)-strip
+               windres = $(Q)$(ROS_PREFIX)-windres
+       endif
 endif
 
 ifneq ($(ROS_INTERMEDIATE),)
index 6ecb48c..cdd6d7f 100644 (file)
   </if>
   
   <if property="GDB" value="0">
-    <compilerflag>-Os</compilerflag>
-    <compilerflag>-Wno-strict-aliasing</compilerflag>
-    <compilerflag>-ftracer</compilerflag>
-    <compilerflag>-momit-leaf-frame-pointer</compilerflag>
-    <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
+    <if property="OPTIMIZE" value="1">
+        <compilerflag>-Os</compilerflag>
+        <compilerflag>-Wno-strict-aliasing</compilerflag>
+        <compilerflag>-ftracer</compilerflag>
+        <compilerflag>-momit-leaf-frame-pointer</compilerflag>
+        <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
+    </if>
+    <if property="OPTIMIZE" value="2">
+        <compilerflag>-Os</compilerflag>
+        <compilerflag>-Wno-strict-aliasing</compilerflag>
+        <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
+    </if>
+    <if property="OPTIMIZE" value="3">
+        <compilerflag>-O1</compilerflag>
+        <compilerflag>-Wno-strict-aliasing</compilerflag>
+        <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
+    </if>
+    <if property="OPTIMIZE" value="4">
+        <compilerflag>-O2</compilerflag>
+        <compilerflag>-Wno-strict-aliasing</compilerflag>
+        <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
+    </if>
+    <if property="OPTIMIZE" value="5">
+        <compilerflag>-O3</compilerflag>
+        <compilerflag>-Wno-strict-aliasing</compilerflag>
+        <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
+    </if>
   </if>
+
   <compilerflag>-Wpointer-arith</compilerflag>
   <linkerflag>-enable-stdcall-fixup</linkerflag>
 
index 5f2b4d6..7c83e9a 100644 (file)
@@ -2882,16 +2882,16 @@ void calc_buffer_format(CALC *calc) {
         MessageBeep(0);
     }
 
-    if (point) {
-        p = calc->buffer;
-        n = _tcslen(p) - 1;
-        while (*(p+n) &&
-                *(p+n) != TEXT('.') &&
-                *(p+n) == TEXT('0')) {
-            calc->buffer[n] = TEXT('\0');
-            n--;
-        }
-    }
+    //if (point) {
+    //    p = calc->buffer;
+    //    n = _tcslen(p) - 1;
+    //    while (*(p+n) &&
+    //            *(p+n) != TEXT('.') &&
+    //           *(p+n) == TEXT('0')) {
+    //        calc->buffer[n] = TEXT('\0');
+    //        n--;
+    //    }
+    //}
 
     // remove leading zeros
 
index c779be7..7a30308 100644 (file)
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <dir.h>
+#include <io.h>
 #include <dos.h>
 
 
index 69ad460..bd276da 100644 (file)
@@ -10,8 +10,9 @@
        <define name="__USE_W32API" />
        <define name="WINVER">0x0501</define>
        <define name="_WIN32_IE>0x0600</define>
-
+       
        <library>kernel32</library>
+       <library>advapi32</library>
        <library>ntdll</library>
        <library>user32</library>
        <library>gdi32</library>
index 42ee02a..dde0911 100644 (file)
@@ -1,54 +1,90 @@
 <tree Version="1"> <!-- Application version this tree is made for -->
        <category name="Internet &amp; Network" icon="1">
-               <application name="Firefox">
+               <application name="Firefox 1.5">
+                       <regname>Mozilla Firefox (1.5)</regname>
+                       <licence>MPL/GPL/LGPL</licence>
+                       <version>1.5.0.9</version>
+                       <description>The most popular and one of the best free WebBrowsers out there.</description>
+                       <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/1.5.0.9/win32/en-US/Firefox%20Setup%201.5.0.9.exe</location>
+               </application>
+               <application name="Firefox 2.0">
+                       <regname>Mozilla Firefox (2.0.0.1)</regname>
+                       <licence>MPL/GPL/LGPL</licence>
+                       <version>2.0.0.1</version>
                        <description>The most popular and one of the best free WebBrowsers out there.</description>
                        <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/latest/win32/en-US/Firefox%20Setup%202.0.0.1.exe</location>
                </application>
                <application name="Thunderbird">
+                       <regname>Mozilla Thunderbird (1.5)</regname>
+                       <licence>MPL/GPL/LGPL</licence>
+                       <version>1.5.0.9</version>
                        <description>The most popular and one of the best free MailClients out there.</description>
                        <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/thunderbird/releases/latest/win32/en-US/Thunderbird%20Setup%201.5.0.9.exe</location>
                </application>
                <application name="SeaMonkey">
+                       <regname>SeaMonkey (1.0.7)</regname>
+                       <version>1.0.7</version>
                        <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, Composer bundle you will ever need.</description>
                        <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/seamonkey/releases/1.0.7/seamonkey-1.0.7.en-US.win32.installer.exe</location>
                </application>
-               <application name="Samba TNG">
-                       <description>This tool allows you to access your Windows shared folders/printers with ReactOS.</description>
-                       <location>http://svn.reactos.org/packages/samba-tng.exe</location>
-               </application>
                <application name="Mozilla ActiveX Control">
+                       <regname>Mozilla ActiveX Control v1.7.12 (ReactOS special)</regname>
+                       <version>1.7.12</version>
                        <description>Essential Component to get ReactOS Explorer's and other application's Internet Browsing feature running.</description>
                        <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/MozillaControl1712-ReactOS.exe</location>
                </application>
+               <application name="Off By One Browser">
+                       <regname>The Off By One Web Browser</regname>
+                       <description>The Off By One Browser is a very small and fast web browser with full HTML 3.2 support.</description>
+                       <location>http://offbyone.com/offbyone/images/OffByOneSetup.exe</location>
+               </application>
+               <application name="Samba TNG">
+                       <description>This tool allows you to access your Windows shared folders/printers with ReactOS.</description>
+                       <location>http://svn.reactos.org/packages/samba-tng.exe</location>
+               </application>
                <application name="Miranda IM">
+                       <regname>Miranda IM</regname>
+                       <version>0.5.1</version>
                        <description>Open source multiprotocol instant messaging application - May not work completely.</description>
                        <location>http://ovh.dl.sourceforge.net/sourceforge/miranda/miranda-im-v0.5.1-unicode.exe</location>
                </application>
                <application name="Putty">
+                       <regname>PuTTY version 0.59</regname>
+                       <licence>MIT</licence>
+                       <version>0.59</version>
                        <description>A free SSH, Telnet, rlogin, and raw TCP client.</description>
-                       <location>http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.58-installer.exe</location>
+                       <location>http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.59-installer.exe</location>
                </application>
        </category>
        <category name="Office" icon="2">
                <application name="Abiword">
+                       <regname>"AbiWord 2.4.1 (remove only)"</regname>
+                       <version>2.4.1</version>
                        <description>Word processor.</description>
                        <location>http://www.abiword.org/downloads/abiword/2.4.1/Windows/abiword-setup-2.4.1.exe</location>
                </application>
                <application name="OpenOffice">
+                       <regname>OpenOffice.org 2.1</regname>
+                       <version>2.1.0</version>
                        <description>THE Open Source Office Suite.</description>
                        <location>http://ftp.tu-chemnitz.de/pub/openoffice-extended//stable/2.1.0/OOo_2.1.0_Win32Intel_install_en-US.exe</location>
                </application>
        </category>
        <category name="Graphics" icon="3">
                <application name="IrfanView">
+                       <regname>IrfanView (remove only)</regname>
+                       <version>3.99</version>
                        <description>Viewer for all kinds of graphics/audio files/video files.</description>
                        <location>http://gd.tuwien.ac.at/graphics/irfanview/iview399.exe</location>
                </application>
                <application name="IrfanView Plugins">
+                       <version>3.99</version>
                        <description>Additional Plugins for supporting more file types.</description>
                        <location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_399.exe</location>
                </application>
                <application name="TuxPaint">
+                       <regname>Tux Paint 0.9.16</regname>
+                       <version>0.9.16</version>
                        <description>An open source bitmap graphics editor geared towards young children.</description>
                        <location>http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.16-win32-installer.exe</location>
                </application>
        </category>
        <category name="Development" icon="5">
                <application name="ReactOS Build Environment">
+                       <regname>ReactOS Build Environment 0.3.4</regname>
+                       <version>0.3.4</version>
                        <description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description>
-                       <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-0.3.3.exe</location>
+                       <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-0.3.4.exe</location>
                </application>
        </category>
        <category name="Games &amp; Fun" icon="6">
                <application name="ScummVM">
+                       <regname>ScummVM 0.9.1</regname>
+                       <version>0.9.1</version>
                        <description>SamNMax, Day of Tentacle, etc on ReactOS</description>
                        <location>http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.9.1-win32.exe</location>
                </application>
                        <description>Nice Clone of Chip's Challenge originally made for the Atari Lynx. Includes free CCLP2 Graphics Pack, so you dont need the copyrighted Original.</description>
                        <location>http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-1.3.0-win32-CCLP2.exe</location>
                </application>
+               <application name="LBreakout2">LBreakout2 2.4.1
+                       <regname>LBreakout2 2.4.1</regname>
+                       <version>2.4.1</version>
+                       <description>Breakout Clone using SDL libs.</description>
+                       <location>http://switch.dl.sourceforge.net/sourceforge/lgames/lbreakout2-2.4.1-win32.exe</location>
+               </application>
+               <application name="LGeneral">
+                       <regname>LGeneral 1.1</regname>
+                       <version>1.1</version>
+                       <description>Panzer General Clone using SDL libs.</description>
+                       <location>http://kent.dl.sourceforge.net/sourceforge/lgames/lgeneral-1.1-win32.exe</location>
+               </application>
+               <application name="LMarbles">
+                       <regname>LMarbles 1.0.6</regname>
+                       <version>1.0.6</version>
+                       <description>Atomix Clone using SDL libs.</description>
+                       <location>http://heanet.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe</location>
+               </application>
        </category>
        <category name="Tools" icon="7">
                <application name="7-Zip">
+                       <regname>7-Zip 4.42</regname>
+                       <version>4.42</version>
                        <description>Utility to create and open 7zip, zip, tar, rar and other archive files.</description>
                        <location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z442.exe</location>
                </application>
                <application name="uTorrent">
+                       <regname>&#181;Torrent</regname>        <!-- XML-Parser-Error:  Mu != &#181; -->
+                       <version>1.6</version>
                        <description>Small and fast Torrent Client.</description>
                        <location>http://download.utorrent.com/1.6/uTorrent-1.6-install.exe</location>
                </application>
                <application name="Audio Grabber">
+                       <regname>Audiograbber 1.83 SE </regname>
+                       <version>1.83 SE</version>
                        <description>A very good CD Ripper/Audio File Converter.</description>
                        <location>http://www.audiograbber.de/files/342677432/agsetup183se.exe</location>
                </application>
index 066ae14..f53eca5 100644 (file)
@@ -2,19 +2,20 @@
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            base/applications/downloader/xml.c
  * PURPOSE:         Main program
- * PROGRAMMERS:     Maarten Bosma
+ * PROGRAMMERS:     Maarten Bosma, Lester Kortenhoeven
  */
 
 #include <windows.h>
 #include <commctrl.h>
 #include <richedit.h>
 #include <stdio.h>
+#include <shlwapi.h>
 #include "resources.h"
 #include "structures.h"
 
 #define XML_PATH "C:\\ReactOS\\system32\\downloader.xml"
 
-HWND hCategories, hApps, hDownloadButton, hUpdateButton, hHelpButton;
+HWND hwnd, hCategories, hApps, hDownloadButton, hUninstallButton, hUpdateButton, hHelpButton;
 HBITMAP hLogo, hUnderline;
 WCHAR* DescriptionHeadline = L"";
 WCHAR* DescriptionText = L"";
@@ -27,13 +28,49 @@ BOOL ProcessXML (const char* filename, struct Category* Root);
 VOID FreeTree (struct Category* Node);
 WCHAR Strings [STRING_COUNT][MAX_STRING_LENGHT];
 
+BOOL getUninstaller(WCHAR* RegName, WCHAR* Uninstaller) {
+
+       const DWORD ArraySize = 200;
+
+       HKEY hKey1;
+       HKEY hKey2;
+       DWORD Type = 0;
+       DWORD Size = ArraySize;
+       WCHAR Value[ArraySize];
+       WCHAR KeyName[ArraySize];
+       LONG i = 0;
+
+       if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall",0,KEY_READ,&hKey1) == ERROR_SUCCESS) {
+               while (RegEnumKeyExW(hKey1,i,KeyName,&Size,NULL,NULL,NULL,NULL) == ERROR_SUCCESS) {
+                       ++i;
+                       RegOpenKeyExW(hKey1,KeyName,0,KEY_READ,&hKey2);
+                       Size = ArraySize;
+                       if (RegQueryValueExW(hKey2,L"DisplayName",0,&Type,(LPBYTE)Value,&Size) == ERROR_SUCCESS) {
+                               Size = ArraySize;
+                               if (StrCmpW(Value,RegName) == 0) {
+                                       if (RegQueryValueExW(hKey2,L"UninstallString",0,&Type,(LPBYTE)Uninstaller,&Size) == ERROR_SUCCESS) {
+                                               RegCloseKey(hKey2);
+                                               RegCloseKey(hKey1);
+                                               return TRUE;
+                                       } else {
+                                               RegCloseKey(hKey2);
+                                               RegCloseKey(hKey1);
+                                               return FALSE;
+                                       }
+                               }
+                       }
+                       RegCloseKey(hKey2);
+                       Size = ArraySize;
+               }
+               RegCloseKey(hKey1);
+       }
+       return FALSE;
+}
+
 void ShowMessage (WCHAR* title, WCHAR* message)
 {
-       HWND hwnd;
        DescriptionHeadline = title;
        DescriptionText = message;
-
-       hwnd = GetParent(hCategories);
        InvalidateRect(hwnd,NULL,TRUE); 
        UpdateWindow(hwnd);
 }
@@ -81,15 +118,23 @@ void CategoryChoosen (HWND hwnd, struct Category* Category)
        Insert.item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_IMAGE;
        Insert.hInsertAfter = TVI_LAST;
        Insert.hParent = TVI_ROOT;
-       Insert.item.iImage = 0;
 
        CurrentApplication = Category->Apps;
 
+       WCHAR Uninstaller[200];
        while(CurrentApplication)
        {
                Insert.item.lParam = (UINT)CurrentApplication;
                Insert.item.pszText = CurrentApplication->Name;
-               Insert.item.cchTextMax = lstrlenW(CurrentApplication->Name); 
+               Insert.item.cchTextMax = lstrlenW(CurrentApplication->Name);
+               Insert.item.iImage = 10;
+               if(StrCmpW(CurrentApplication->RegName,L"")) {
+                       if(getUninstaller(CurrentApplication->RegName, Uninstaller))
+                               Insert.item.iImage = 9;
+               } else {
+                       if(getUninstaller(CurrentApplication->Name, Uninstaller))
+                               Insert.item.iImage = 9;
+               } 
                SendMessage(hwnd, TVM_INSERTITEM, 0, (LPARAM)&Insert);
                CurrentApplication = CurrentApplication->Next;
        }
@@ -118,10 +163,13 @@ BOOL SetupControls (HWND hwnd)
        hHelpButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 550, 10, 40, 40, hwnd, 0, hInstance, NULL);
        hUpdateButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 500, 10, 40, 40, hwnd, 0, hInstance, NULL);
        hDownloadButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 330, 505, 140, 33, hwnd, 0, hInstance, NULL);
+       hUninstallButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 260, 505, 140, 33, hwnd, 0, hInstance, NULL);
 
        SendMessageW(hHelpButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_HELP)));
        SendMessageW(hUpdateButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP,(LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_UPDATE)));
        SendMessageW(hDownloadButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP,(LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_DOWNLOAD)));
+       SendMessageW(hUninstallButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP,(LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_UNINSTALL)));
+       ShowWindow(hUninstallButton, SW_HIDE);
 
        // Set deflaut entry for hApps
        Insert.item.mask = TVIF_TEXT|TVIF_IMAGE;
@@ -143,7 +191,9 @@ BOOL SetupControls (HWND hwnd)
        ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_5)), NULL); 
        ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_6)), NULL); 
        ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_7)), NULL); 
-       ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_8)), NULL); 
+       ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_8)), NULL);
+       ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_9)), NULL); 
+       ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_10)), NULL);
 
        // Fill the TreeViews
        AddItems (hCategories, Root.Children, NULL);
@@ -200,6 +250,37 @@ static void DrawDescription (HDC hdc, RECT DescriptionRect)
 
 }
 
+void showUninstaller() {
+       int Split_Vertical = 200;
+       RECT Rect;
+
+        GetClientRect(hwnd,&Rect);
+       ShowWindow(hUninstallButton,SW_SHOW);
+       MoveWindow(hDownloadButton,(Split_Vertical+Rect.right-Rect.left)/2,Rect.bottom-Rect.top-45,140,35,TRUE);;
+}
+
+void hideUninstaller() {
+       int Split_Vertical = 200;
+       RECT Rect;
+
+        GetClientRect(hwnd,&Rect);
+       ShowWindow(hUninstallButton,SW_HIDE);
+       MoveWindow(hDownloadButton,(Split_Vertical+Rect.right-Rect.left)/2-70,Rect.bottom-Rect.top-45,140,35,TRUE);
+}
+
+void startUninstaller(WCHAR* Uninstaller) {
+       STARTUPINFOW si;
+       PROCESS_INFORMATION pi;
+
+       memset(&si, 0, sizeof(si));
+       si.cb = sizeof(si);
+       CreateProcessW(NULL,Uninstaller,NULL,NULL,FALSE,0,NULL,NULL,&si,&pi); 
+       CloseHandle(pi.hThread);
+       // WaitForSingleObject(pi.hProcess, INFINITE); // If you want to wait for the Unistaller
+       CloseHandle(pi.hProcess);
+        hideUninstaller();
+}
+
 LRESULT CALLBACK WndProc (HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
 {
        static RECT DescriptionRect;
@@ -244,6 +325,20 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
                                        else
                                                ShowMessage(Strings[IDS_NO_APP_TITLE], Strings[IDS_NO_APP]);
                                }
+                               else if (lParam == (LPARAM)hUninstallButton)
+                               {
+                                       if(SelectedApplication)
+                                       {
+                                               WCHAR Uninstaller[200];
+                                               if(StrCmpW(SelectedApplication->RegName, L"")) {
+                                                       if(getUninstaller(SelectedApplication->RegName, Uninstaller))
+                                                               startUninstaller(Uninstaller);
+                                               } else {
+                                                       if(getUninstaller(SelectedApplication->Name, Uninstaller))
+                                                               startUninstaller(Uninstaller);
+                                               }
+                                       }
+                               }
                                else if (lParam == (LPARAM)hUpdateButton)
                                {
                                        ShowMessage(Strings[IDS_UPDATE_TITLE], Strings[IDS_UPDATE]);
@@ -261,6 +356,7 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
                        LPNMHDR data = (LPNMHDR)lParam;
                        if(data->code == TVN_SELCHANGED)
                        {
+                               BOOL bShowUninstaller = FALSE;
                                if(data->hwndFrom == hCategories) 
                                {
                                        struct Category* Category = (struct Category*) ((LPNMTREEVIEW)lParam)->itemNew.lParam;
@@ -270,8 +366,43 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
                                {
                                        SelectedApplication = (struct Application*) ((LPNMTREEVIEW)lParam)->itemNew.lParam;
                                        if(SelectedApplication)
-                                               ShowMessage(SelectedApplication->Name, SelectedApplication->Description);
+                                       {
+                                               DescriptionText = calloc(700,sizeof(WCHAR));
+                                               if(StrCmpW(SelectedApplication->Version, L"")) {
+                                                       StrCatW(DescriptionText, Strings[IDS_VERSION]);
+                                                       StrCatW(DescriptionText, SelectedApplication->Version);
+                                                       StrCatW(DescriptionText, L"\n");
+                                               }
+                                               if(StrCmpW(SelectedApplication->Licence, L"")) {
+                                                       StrCatW(DescriptionText, Strings[IDS_LICENCE]);
+                                                       StrCatW(DescriptionText, SelectedApplication->Licence);
+                                                       StrCatW(DescriptionText, L"\n");
+                                               }
+                                               if(StrCmpW(SelectedApplication->Maintainer, L"")) {
+                                                       StrCatW(DescriptionText, Strings[IDS_MAINTAINER]);
+                                                       StrCatW(DescriptionText, SelectedApplication->Maintainer);
+                                                       StrCatW(DescriptionText, L"\n");
+                                               }
+                                               if(StrCmpW(SelectedApplication->Licence, L"") || StrCmpW(SelectedApplication->Version, L"") || StrCmpW(SelectedApplication->Maintainer, L""))
+                                                       StrCatW(DescriptionText, L"\n");
+                                               StrCatW(DescriptionText, SelectedApplication->Description);
+                                               ShowMessage(SelectedApplication->Name, DescriptionText);
+                                               WCHAR Uninstaller[200];
+                                               if(StrCmpW(SelectedApplication->RegName, L"")) {
+                                                       if(getUninstaller(SelectedApplication->RegName, Uninstaller)) {
+                                                               bShowUninstaller = TRUE;
+                                                       }
+                                               } else {
+                                                       if(getUninstaller(SelectedApplication->Name, Uninstaller)) {
+                                                               bShowUninstaller = TRUE;
+                                                       }
+                                               }
+                                       }
                                }
+                               if (bShowUninstaller)
+                                       showUninstaller();
+                               else
+                                       hideUninstaller();
                        }
                }
                break;
@@ -279,8 +410,8 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
                case WM_SIZING:
                {
                        LPRECT pRect = (LPRECT)lParam;
-                       if (pRect->right-pRect->left < 400)
-                               pRect->right = pRect->left + 400;
+                       if (pRect->right-pRect->left < 520)
+                               pRect->right = pRect->left + 520;
 
                        if (pRect->bottom-pRect->top < 300)
                                pRect->bottom = pRect->top + 300;
@@ -299,7 +430,11 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
 
                        MoveWindow(hHelpButton, LOWORD(lParam)-50, 10, 40, 40, TRUE);
                        MoveWindow(hUpdateButton, LOWORD(lParam)-100, 10, 40, 40, TRUE);
-                       MoveWindow(hDownloadButton, (Split_Vertical+LOWORD(lParam))/2-70, HIWORD(lParam)-45, 140, 35, TRUE);
+                       if(IsWindowVisible(hUninstallButton))
+                               MoveWindow(hDownloadButton, (Split_Vertical+LOWORD(lParam))/2, HIWORD(lParam)-45, 140, 35, TRUE);
+                       else
+                               MoveWindow(hDownloadButton, (Split_Vertical+LOWORD(lParam))/2-70, HIWORD(lParam)-45, 140, 35, TRUE);
+                       MoveWindow(hUninstallButton, (Split_Vertical+LOWORD(lParam))/2-140, HIWORD(lParam)-45, 140, 35, TRUE);
                }
                break;
 
@@ -320,7 +455,6 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
 INT WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInst,
                                        LPSTR lpCmdLine, INT nCmdShow)
 {
-       HWND hwnd;
        int i;
        WNDCLASSEXW WndClass = {0};
        MSG msg;
index e06ded1..e3918f6 100644 (file)
@@ -5,6 +5,7 @@
 #define IDB_HELP                       0x102
 #define IDB_UPDATE                     0x103
 #define IDB_DOWNLOAD           0x104
+#define IDB_UNINSTALL          0x105
 #define IDB_TREEVIEW_ICON_0    0x900
 #define IDB_TREEVIEW_ICON_1    0x901
 #define IDB_TREEVIEW_ICON_2    0x902
@@ -14,6 +15,8 @@
 #define IDB_TREEVIEW_ICON_6    0x906
 #define IDB_TREEVIEW_ICON_7    0x907
 #define IDB_TREEVIEW_ICON_8    0x908
+#define IDB_TREEVIEW_ICON_9    0x909
+#define IDB_TREEVIEW_ICON_10   0x910
 #define IDD_DOWNLOAD           0x100
 #define IDC_PROGRESS           0x1000
 #define IDC_STATUS                     0x1001
@@ -36,6 +39,9 @@
 #define IDS_XMLERROR_1         14
 #define IDS_XMLERROR_2         15
 #define IDS_DOWNLOAD_ERROR     16
+#define IDS_VERSION            17
+#define IDS_LICENCE            18
+#define IDS_MAINTAINER         19
 
-#define STRING_COUNT           17
+#define STRING_COUNT           20
 #define        MAX_STRING_LENGHT       0x100
diff --git a/reactos/base/applications/downloader/resources/10.bmp b/reactos/base/applications/downloader/resources/10.bmp
new file mode 100644 (file)
index 0000000..d0825e8
Binary files /dev/null and b/reactos/base/applications/downloader/resources/10.bmp differ
diff --git a/reactos/base/applications/downloader/resources/9.bmp b/reactos/base/applications/downloader/resources/9.bmp
new file mode 100644 (file)
index 0000000..1e28d93
Binary files /dev/null and b/reactos/base/applications/downloader/resources/9.bmp differ
diff --git a/reactos/base/applications/downloader/resources/uninstall.bmp b/reactos/base/applications/downloader/resources/uninstall.bmp
new file mode 100644 (file)
index 0000000..077cac9
Binary files /dev/null and b/reactos/base/applications/downloader/resources/uninstall.bmp differ
index 79a36ef..ee4a532 100644 (file)
@@ -1,11 +1,11 @@
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDI_MAIN               ICON DISCARDABLE        "resources/main.ico"
-//IDB_UNDERLINE                BITMAP DISCARDABLE      "resources/underline.bmp"
 IDB_LOGO               BITMAP DISCARDABLE      "resources/logo.bmp"
 IDB_HELP               BITMAP DISCARDABLE      "resources/help.bmp"
 IDB_UPDATE             BITMAP DISCARDABLE      "resources/update.bmp"
 IDB_DOWNLOAD           BITMAP DISCARDABLE      "resources/download.bmp"
+IDB_UNINSTALL          BITMAP DISCARDABLE      "resources/uninstall.bmp"
 IDB_UNDERLINE          BITMAP DISCARDABLE      "resources/underline.bmp"
 IDB_TREEVIEW_ICON_0    BITMAP DISCARDABLE      "resources/0.bmp"
 IDB_TREEVIEW_ICON_1    BITMAP DISCARDABLE      "resources/1.bmp"
@@ -16,6 +16,8 @@ IDB_TREEVIEW_ICON_5   BITMAP DISCARDABLE      "resources/5.bmp"
 IDB_TREEVIEW_ICON_6    BITMAP DISCARDABLE      "resources/6.bmp"
 IDB_TREEVIEW_ICON_7    BITMAP DISCARDABLE      "resources/7.bmp"
 IDB_TREEVIEW_ICON_8    BITMAP DISCARDABLE      "resources/8.bmp"
+IDB_TREEVIEW_ICON_9    BITMAP DISCARDABLE      "resources/9.bmp"
+IDB_TREEVIEW_ICON_10   BITMAP DISCARDABLE      "resources/10.bmp"
 
 
 #include "translations/de.rc"
index d0c9096..3044ce5 100644 (file)
@@ -2,6 +2,7 @@
 struct Application
 {
        WCHAR Name[0x100];
+       WCHAR RegName[0x100];
        WCHAR Version[0x100];
        WCHAR Maintainer[0x100];
        WCHAR Licence[0x100];
index f95ee9f..01e01a8 100644 (file)
@@ -29,4 +29,7 @@ BEGIN
   IDS_XMLERROR_1               "XML Datei nicht gefunden!"
   IDS_XMLERROR_2               "XML Datei kann nicht verarbeitet werden!"
   IDS_DOWNLOAD_ERROR           "Die Datei konnte nicht runtergeladen werden.\nBitte prüfen sie, ob eine Verbindung zum Internet besteht."
+  IDS_VERSION                  "Version: "
+  IDS_LICENCE                  "Lizenz: "
+  IDS_MAINTAINER               "Maintainer: "
 END
index c216fb9..c54fe27 100644 (file)
@@ -29,4 +29,7 @@ BEGIN
   IDS_XMLERROR_1               "Could not find the xml file !"
   IDS_XMLERROR_2               "Could not parse the xml file !"
   IDS_DOWNLOAD_ERROR           "Unable to download the file.\nPlease check you internet connection."
+  IDS_VERSION                  "Version: "
+  IDS_LICENCE                  "Licence: "
+  IDS_MAINTAINER               "Maintainer: "
 END
index a71295c..a75b97e 100644 (file)
@@ -29,4 +29,7 @@ BEGIN
   IDS_XMLERROR_1               "Impossible de trouver le fichier xml !"
   IDS_XMLERROR_2               "Impossible d'analyser le fichier xml !"
   IDS_DOWNLOAD_ERROR           "Impossible de télécharger le fichier.\nVeuillez vérifier votre connexion Internet."
+  IDS_VERSION                  "Version: "
+  IDS_LICENCE                  "Licence: "
+  IDS_MAINTAINER               "Maintainer: "
 END
index 58f6d74..bd3c2a6 100644 (file)
@@ -29,4 +29,7 @@ BEGIN
   IDS_XMLERROR_1               "File xml non trovato !"
   IDS_XMLERROR_2               "Impossibile trattare il contenuto del file xml !"
   IDS_DOWNLOAD_ERROR           "Download del file impossibile.\nVerifica la connessione a Internet."
+  IDS_VERSION                  "Version: "
+  IDS_LICENCE                  "Licence: "
+  IDS_MAINTAINER               "Maintainer: "
 END
index b2129fc..edf2146 100644 (file)
@@ -2,7 +2,7 @@
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            base\applications\downloader\xml.c
  * PURPOSE:         Parsing of application information xml files
- * PROGRAMMERS:     Maarten Bosma
+ * PROGRAMMERS:     Maarten Bosma, Lester Kortenhoeven
  */
 
 #include <libs/expat/expat.h>
@@ -81,6 +81,15 @@ void tag_opened (void* usrdata, const char* tag, const char** arg)
                        CurrentApplication = Current->Apps;
                }
 
+               int currentlengt = lstrlenW(CurrentApplication->Maintainer);
+               MultiByteToWideChar(CP_ACP, 0, 0, 0, &CurrentApplication->Maintainer[currentlengt], 0x100-currentlengt);
+               currentlengt = lstrlenW(CurrentApplication->RegName);
+               MultiByteToWideChar(CP_ACP, 0, 0, 0, &CurrentApplication->RegName[currentlengt], 0x100-currentlengt);
+               currentlengt = lstrlenW(CurrentApplication->Version);
+               MultiByteToWideChar(CP_ACP, 0, 0, 0, &CurrentApplication->Version[currentlengt], 0x100-currentlengt);
+               currentlengt = lstrlenW(CurrentApplication->Licence);
+               MultiByteToWideChar(CP_ACP, 0, 0, 0, &CurrentApplication->Licence[currentlengt], 0x100-currentlengt);
+
                for (i=0; arg[i]; i+=2) 
                {
                        if(!strcmp(arg[i], "name"))
@@ -103,12 +112,16 @@ void text (void* usrdata, const char* data, int len)
        if (!CurrentApplication)
                return;
 
-       // FIXME: handle newlines e.g. in Description
        if(!strcmp(CurrentTag, "maintainer"))
        {
-               int currentlengt = lstrlenW(CurrentApplication->Location);
+               int currentlengt = lstrlenW(CurrentApplication->Maintainer);
                MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Maintainer[currentlengt], 0x100-currentlengt);
        }
+       else if(!strcmp(CurrentTag, "regname"))
+       {
+               int currentlengt = lstrlenW(CurrentApplication->RegName);
+               MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->RegName[currentlengt], 0x100-currentlengt);
+       }
        else if(!strcmp(CurrentTag, "description"))
        {
                int currentlengt = lstrlenW(CurrentApplication->Description);
@@ -119,6 +132,16 @@ void text (void* usrdata, const char* data, int len)
                int currentlengt = lstrlenW(CurrentApplication->Location);
                MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Location[currentlengt], 0x100-currentlengt);
        }
+       else if(!strcmp(CurrentTag, "version"))
+       {
+               int currentlengt = lstrlenW(CurrentApplication->Version);
+               MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Version[currentlengt], 0x400-currentlengt);
+       }
+       else if(!strcmp(CurrentTag, "licence"))
+       {
+               int currentlengt = lstrlenW(CurrentApplication->Licence);
+               MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Licence[currentlengt], 0x100-currentlengt);
+       }
 }
 
 void tag_closed (void* tree, const char* tag)
index cda7203..4fc86c0 100644 (file)
@@ -21,7 +21,7 @@ CardWindow SolWnd;
 
 LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam);
 
-void MakePath(TCHAR *szDest, UINT nDestLen, TCHAR *szExt)
+void MakePath(TCHAR *szDest, UINT nDestLen, const TCHAR *szExt)
 {
     TCHAR *ptr;
     
index f777dc7..eab4c86 100644 (file)
@@ -149,14 +149,16 @@ MainFrameBase::MainFrameBase(HWND hwnd)
        rbBand.cyMaxChild = 0;
        rbBand.cyIntegral = btn_hgt;
 
-       rbBand.lpText = TEXT("Toolbar");
+       TCHAR ToolBarText[] = _T("Toolbar");
+       rbBand.lpText = ToolBarText;
        rbBand.hwndChild = _htoolbar;
        rbBand.cxMinChild = 0;
        rbBand.cyMinChild = btn_hgt + 4;
        rbBand.cx = 182;
        SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand);
 
-       rbBand.lpText = TEXT("Address");
+       TCHAR AddressText[] = _T("Address");
+       rbBand.lpText = AddressText;
        rbBand.hwndChild = _haddressedit;
        rbBand.cxMinChild = 0;
        rbBand.cyMinChild = btn_hgt - 2;
index 56f7fae..15b2096 100644 (file)
  // Martin Fuchs, 23.07.2003
  //
 
+ // STL headers for strings and streams
+#include <string>
+#include <iostream>
+using namespace std;
 
  // standard windows headers
 #define WIN32_LEAN_AND_MEAN
@@ -155,11 +159,6 @@ BOOL exists_path(LPCTSTR path);
 #pragma warning(disable: 4786) // disable warnings about too long debug information symbols
 #endif
 
- // STL headers for strings and streams
-#include <string>
-#include <iostream>
-using namespace std;
-
  // containers
 #include <map>
 #include <set>
index 0eadea6..3697269 100644 (file)
@@ -707,7 +707,7 @@ struct XMLNode : public XS_String
                        return super::find(x);
                }
 
-               XS_String get(const char* x, LPXSSTR def=XS_EMPTY_STR) const
+               XS_String get(const char* x, LPCXSSTR def=XS_EMPTY_STR) const
                {
                        const_iterator found = find(x);
 
@@ -720,7 +720,7 @@ struct XMLNode : public XS_String
 #else
        struct AttributeMap : public std::map<XS_String, XS_String>
        {
-               XS_String get(const char* x, LPXSSTR def=XS_EMPTY_STR) const
+               XS_String get(const char* x, LPCXSSTR def=XS_EMPTY_STR) const
                {
                        const_iterator found = find(x);
 
@@ -840,7 +840,7 @@ struct XMLNode : public XS_String
        }
 
         /// read only access to an attribute
-       template<typename T> XS_String get(const T& attr_name, LPXSSTR def=XS_EMPTY_STR) const
+       template<typename T> XS_String get(const T& attr_name, LPCXSSTR def=XS_EMPTY_STR) const
        {
                AttributeMap::const_iterator found = _attributes.find(attr_name);
 
index 76bb895..4c7b8f6 100644 (file)
@@ -133,7 +133,7 @@ void BrowserNavigator::goto_url(LPCTSTR url)
        else {
                _new_url = url;
 
-               _browser->Navigate(L"about:blank", NULL, NULL, NULL, NULL);
+               _browser->Navigate(BStr(L"about:blank"), NULL, NULL, NULL, NULL);
        }
 }
 
index 3afffe5..84c513b 100644 (file)
@@ -460,8 +460,7 @@ TbdCreateToolbarWnd(PTOOLBAR_DOCKS TbDocks,
 
                 if (Drag)
                 {
-                    SetCursor(LoadCursor(NULL,
-                                         MAKEINTRESOURCE(IDC_ARROW)));
+                    SetCursor(LoadCursor(NULL, IDC_ARROW));
                     SendMessage(hToolbar,
                                 WM_NCLBUTTONDOWN,
                                 HTCAPTION,
@@ -936,8 +935,7 @@ RebarSubclassProc(HWND hWnd,
                                                         &pt,
                                                         1);
 
-                                        SetCursor(LoadCursor(NULL,
-                                                             MAKEINTRESOURCE(IDC_SIZEALL)));
+                                        SetCursor(LoadCursor(NULL, IDC_SIZEALL));
 
                                         SendMessage(TbDocks->hRebar[DragTo],
                                                     WM_LBUTTONDOWN,
index 6a03a70..cc21736 100644 (file)
@@ -176,15 +176,15 @@ char *hookup(char *host, int port)
                code = -1;
                goto bad;
        }
-        cin = cout = s;
+       cin = cout = s;
        if (verbose) {
                printf("Connected to %s.\n", hostname);
                (void) fflush(stdout);
        }
        if (getreply(0) > 2) {  /* read startup message from server */
-           closesocket(cin);
-           code = -1;
-           goto bad;
+               closesocket(cin);
+               code = -1;
+               goto bad;
        }
 #ifdef SO_OOBINLINE
        {
@@ -222,26 +222,26 @@ int login(const char *host)
                acct = pacct;
        }
        while (user == NULL) {
-           const char *myname = "none"; // This needs to become the usename env
-
-           if (myname)
-              printf("Name (%s:%s): ", host, myname);
-           else
-              printf("Name (%s): ", host);
-          (void) fflush(stdout);
-           (void) fgets(tmp, sizeof(tmp) - 1, stdin);
-           tmp[strlen(tmp) - 1] = '\0';
-           if (*tmp == '\0')
-              user = myname;
-           else
-              user = tmp;
+               const char *myname = "none"; // This needs to become the usename env
+
+               if (myname)
+                       printf("Name (%s:%s): ", host, myname);
+               else
+                       printf("Name (%s): ", host);
+               (void) fflush(stdout);
+               (void) fgets(tmp, sizeof(tmp) - 1, stdin);
+               tmp[strlen(tmp) - 1] = '\0';
+               if (*tmp == '\0')
+                       user = myname;
+               else
+                       user = tmp;
        }
        n = command("USER %s", user);
        if (n == CONTINUE) {
                if (pass == NULL)
                        pass = getpass("Password:");
                n = command("PASS %s", pass);
-                fflush(stdin);
+               fflush(stdin);
        }
        if (n == CONTINUE) {
                aflag++;
@@ -284,7 +284,7 @@ int command(const char *fmt, ...)
 {
        va_list ap;
        int r;
-       void (*oldintr)(int), cmdabort(int);
+       void (*oldintr)(int);
 
        abrtflag = 0;
        if (debug) {
@@ -301,16 +301,16 @@ int command(const char *fmt, ...)
                return (0);
        }
        oldintr = signal(SIGINT,cmdabort);
-        {
-           char buffer[1024];
+       {
+               char buffer[1024];
 
-           va_start(ap, fmt);
-           vsprintf(buffer, fmt, ap);
-           va_end(ap);
+               va_start(ap, fmt);
+               vsprintf(buffer, fmt, ap);
+               va_end(ap);
 //DLJ: to work through  firewalls - send the command as a single message
-                  strcat(buffer,"\r\n");
-           fprintfSocket(cout, buffer);
-        }
+               strcat(buffer,"\r\n");
+               fprintfSocket(cout, buffer);
+       }
 //DLJ: the following two lines are replaced by the strcat above - seems to
 // make it work through firewalls.
 //     fprintfSocket(cout, "\r\n");
@@ -335,7 +335,7 @@ getreply(expecteof)
        register int dig;
        register char *cp;
        int originalcode = 0, continuation = 0;
-       void (*oldintr)(int), cmdabort(int);
+       void (*oldintr)(int);
        int pflag = 0;
        char *pt = pasv;
 
@@ -460,7 +460,7 @@ void abortsend()
 void sendrequest(const char *cmd, const char *local, const char *remote, int printnames)
 {
        FILE *fin;
-        int dout = 0;
+       int dout = 0;
        int (*closefunc)(), _pclose(), fclose();
        sig_t (*oldintr)(), (*oldintp)();
        char buf[BUFSIZ], *bufp;
@@ -624,39 +624,39 @@ null();// oldintp = signal(SIGPIPE, SIG_IGN);
 
        case TYPE_A:
                {
-        char buf[1024];
+               char buf[1024];
                static int bufsize = 1024;
                int ipos=0;
 
                while ((c = getc(fin)) != EOF) {
-                   if (c == '\n') {
-                      while (hash && (bytes >= hashbytes)) {
-                         (void) putchar('#');
-                         (void) fflush(stdout);
-                         hashbytes += HASHBYTES;
-                      }
+                       if (c == '\n') {
+                               while (hash && (bytes >= hashbytes)) {
+                                       (void) putchar('#');
+                                       (void) fflush(stdout);
+                                       hashbytes += HASHBYTES;
+                               }
 // Szurgot: The following code is unncessary on Win32.
-//                      (void) fputcSocket(dout, '\r');
-//                         bytes++;
-                   }
-
-                                  if (ipos >= bufsize) {
-                                               fputSocket(dout,buf,ipos);
-                                               if(!hash) (void) putchar('.');
-                                               ipos=0;
-                                  }
-                                  buf[ipos]=c; ++ipos;
-                                  bytes++;
+//                             (void) fputcSocket(dout, '\r');
+//                             bytes++;
+                       }
+
+                       if (ipos >= bufsize) {
+                               fputSocket(dout,buf,ipos);
+                               if(!hash) (void) putchar('.');
+                               ipos=0;
+                       }
+                       buf[ipos]=c; ++ipos;
+                       bytes++;
                }
                if (ipos) {
                        fputSocket(dout,buf,ipos);
                        ipos=0;
                }
                if (hash) {
-                   if (bytes < hashbytes)
-                      (void) putchar('#');
-                   (void) putchar('\n');
-                   (void) fflush(stdout);
+                       if (bytes < hashbytes)
+                       (void) putchar('#');
+                       (void) putchar('\n');
+                       (void) fflush(stdout);
                }
                else {
                        (void) putchar('.');
@@ -664,13 +664,13 @@ null();// oldintp = signal(SIGPIPE, SIG_IGN);
                        (void) fflush(stdout);
                }
                if (ferror(fin))
-                   perror(local);
+                       perror(local);
 //             if (ferror(dout)) {
 //                     if (errno != EPIPE)
 //                             perror("netout");
 //                     bytes = -1;
 //             }
-                break;
+               break;
                }
        }
        (void) gettimeofday(&stop, (struct timezone *)0);
@@ -734,13 +734,13 @@ void recvrequest(const char *cmd, const char *local, const char *remote, const c
                 int printnames)
 {
        FILE *fout = stdout;
-        int din = 0;
+       int din = 0;
        int (*closefunc)(), _pclose(), fclose();
        void (*oldintr)(int), (*oldintp)(int);
        int oldverbose = 0, oldtype = 0, is_retr, tcrflag, nfnd, bare_lfs = 0;
        char msg;
 //     static char *buf; // Szurgot: Shouldn't this go SOMEWHERE?
-        char buf[1024];
+       char buf[1024];
        static int bufsize = 1024;
        long bytes = 0, hashbytes = HASHBYTES;
 //     struct
@@ -783,45 +783,45 @@ null();// oldintr = signal(SIGINT, abortrecv);
        if (strcmp(local, "-") && *local != '|') {
 #ifndef _WIN32
 // This whole thing is a problem... access Won't work on non-existent files
-           if (access(local, 2) < 0) {
-              char *dir = rindex(local, '/');
-
-              if (errno != ENOENT && errno != EACCES) {
-                 perror(local);
-                 (void) signal(SIGINT, oldintr);
-                 code = -1;
-                 return;
-              }
-              if (dir != NULL)
-                 *dir = 0;
-              d = access(dir ? local : ".", 2);
-              if (dir != NULL)
-                 *dir = '/';
-              if (d < 0) {
-                 perror(local);
-                 (void) signal(SIGINT, oldintr);
-                 code = -1;
-                 return;
-              }
-              if (!runique && errno == EACCES &&
-                  chmod(local, 0600) < 0) {
-                 perror(local);
-                 (void) signal(SIGINT, oldintr);
-                 code = -1;
-                 return;
-              }
-              if (runique && errno == EACCES &&
-                  (local = gunique(local)) == NULL) {
-                 (void) signal(SIGINT, oldintr);
-                 code = -1;
-                 return;
-              }
-           }
-           else if (runique && (local = gunique(local)) == NULL) {
-              (void) signal(SIGINT, oldintr);
-              code = -1;
-              return;
-           }
+               if (access(local, 2) < 0) {
+                       char *dir = rindex(local, '/');
+
+                       if (errno != ENOENT && errno != EACCES) {
+                               perror(local);
+                               (void) signal(SIGINT, oldintr);
+                               code = -1;
+                               return;
+                       }
+                       if (dir != NULL)
+                               *dir = 0;
+                       d = access(dir ? local : ".", 2);
+                       if (dir != NULL)
+                               *dir = '/';
+                       if (d < 0) {
+                               perror(local);
+                               (void) signal(SIGINT, oldintr);
+                               code = -1;
+                               return;
+                       }
+                       if (!runique && errno == EACCES &&
+                           chmod(local, 0600) < 0) {
+                               perror(local);
+                               (void) signal(SIGINT, oldintr);
+                               code = -1;
+                               return;
+                       }
+                       if (runique && errno == EACCES &&
+                           (local = gunique(local)) == NULL) {
+                               (void) signal(SIGINT, oldintr);
+                               code = -1;
+                               return;
+                       }
+               }
+               else if (runique && (local = gunique(local)) == NULL) {
+                       (void) signal(SIGINT, oldintr);
+                       code = -1;
+                       return;
+               }
 #endif
        }
        if (initconn()) {
@@ -926,15 +926,15 @@ null();//         oldintp = signal(SIGPIPE, SIG_IGN);
 //                     if ((d = write(fileno(fout), buf, c)) != c)
 //                             break;
                while ((c = recv(din, buf, bufsize, 0)) > 0) {
-                   write(fileno(fout), buf, c);
-                   bytes += c;
-                   if (hash) {
-                      while (bytes >= hashbytes) {
-                         (void) putchar('#');
-                         hashbytes += HASHBYTES;
-                      }
-                      (void) fflush(stdout);
-                   }
+                       write(fileno(fout), buf, c);
+                       bytes += c;
+                       if (hash) {
+                               while (bytes >= hashbytes) {
+                                       (void) putchar('#');
+                                       hashbytes += HASHBYTES;
+                               }
+                               (void) fflush(stdout);
+                       }
                }
                if (hash && bytes > 0) {
                        if (bytes < HASHBYTES)
@@ -981,23 +981,23 @@ done:
                        if (c == '\n')
                                bare_lfs++;
                        while (c == '\r') {
-                           while (hash && (bytes >= hashbytes)) {
-                              (void) putchar('#');
-                              (void) fflush(stdout);
-                              hashbytes += HASHBYTES;
-                           }
-                           bytes++;
-                           if ((c = fgetcSocket(din)) != '\n' || tcrflag) {
-                              if (ferror(fout))
-                                 goto break2;
-                              (void) putc('\r', fout);
-                              if (c == '\0') {
-                                 bytes++;
-                                 goto contin2;
-                              }
-                              if (c == EOF)
-                                 goto contin2;
-                           }
+                               while (hash && (bytes >= hashbytes)) {
+                                       (void) putchar('#');
+                                       (void) fflush(stdout);
+                                       hashbytes += HASHBYTES;
+                               }
+                               bytes++;
+                               if ((c = fgetcSocket(din)) != '\n' || tcrflag) {
+                                       if (ferror(fout))
+                                       goto break2;
+                                       (void) putc('\r', fout);
+                                       if (c == '\0') {
+                                               bytes++;
+                                               goto contin2;
+                                       }
+                                       if (c == EOF)
+                                               goto contin2;
+                               }
                        }
                        (void) putc(c, fout);
                        bytes++;
@@ -1089,7 +1089,7 @@ null();//         (void) signal(SIGINT,oldintr);
        fprintfSocket(cout,"%c%c",IAC,IP);
        msg = (char)IAC;
 /* send IAC in urgent mode instead of DM because UNIX places oob mark */
-/* after urgent byte rather than before as now is protocol            */
+/* after urgent byte rather than before as now is protocol */
        if (send(cout,&msg,1,MSG_OOB) != 1) {
                perror("abort");
        }
@@ -1154,51 +1154,51 @@ initconn()
 
 
        if (passivemode) {
-      data = socket(AF_INET, SOCK_STREAM, 0);
-      if (data < 0) {
-        perror("ftp: socket");
-        return(1);
-      }
-      if ((options & SO_DEBUG) &&
-          setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on,
-                     sizeof (on)) < 0)
-        perror("ftp: setsockopt (ignored)");
-      if (command("PASV") != COMPLETE) {
-        printf("Passive mode refused.\n");
-        goto bad;
-      }
-
-      /*
-       * What we've got at this point is a string of comma
-       * separated one-byte unsigned integer values.
-       * The first four are the an IP address. The fifth is
-       * the MSB of the port number, the sixth is the LSB.
-       * From that we'll prepare a sockaddr_in.
-       */
-
-      if (sscanf(pasv,"%d,%d,%d,%d,%d,%d",
-                 &a0, &a1, &a2, &a3, &p0, &p1) != 6) {
-        printf("Passive mode address scan failure. Shouldn't happen!\n");
-        goto bad;
-      }
-
-      bzero(&data_addr, sizeof(data_addr));
-      data_addr.sin_family = AF_INET;
-      a = (char *)&data_addr.sin_addr.s_addr;
-      a[0] = a0 & 0xff;
-      a[1] = a1 & 0xff;
-      a[2] = a2 & 0xff;
-      a[3] = a3 & 0xff;
-      p = (char *)&data_addr.sin_port;
-      p[0] = p0 & 0xff;
-      p[1] = p1 & 0xff;
-
-      if (connect(data, (struct sockaddr *)&data_addr,
-                  sizeof(data_addr)) < 0) {
-        perror("ftp: connect");
-        goto bad;
-      }
-      return(0);
+               data = socket(AF_INET, SOCK_STREAM, 0);
+               if (data < 0) {
+                       perror("ftp: socket");
+                       return(1);
+               }
+               if ((options & SO_DEBUG) &&
+                   setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on,
+                   sizeof (on)) < 0)
+                       perror("ftp: setsockopt (ignored)");
+               if (command("PASV") != COMPLETE) {
+                       printf("Passive mode refused.\n");
+                       goto bad;
+               }
+
+               /*
+                * What we've got at this point is a string of comma
+                * separated one-byte unsigned integer values.
+                * The first four are the an IP address. The fifth is
+                * the MSB of the port number, the sixth is the LSB.
+                * From that we'll prepare a sockaddr_in.
+                */
+
+               if (sscanf(pasv,"%d,%d,%d,%d,%d,%d",
+                   &a0, &a1, &a2, &a3, &p0, &p1) != 6) {
+                       printf("Passive mode address scan failure. Shouldn't happen!\n");
+                       goto bad;
+               }
+
+               bzero(&data_addr, sizeof(data_addr));
+               data_addr.sin_family = AF_INET;
+               a = (char *)&data_addr.sin_addr.s_addr;
+               a[0] = a0 & 0xff;
+               a[1] = a1 & 0xff;
+               a[2] = a2 & 0xff;
+               a[3] = a3 & 0xff;
+               p = (char *)&data_addr.sin_port;
+               p[0] = p0 & 0xff;
+               p[1] = p1 & 0xff;
+
+               if (connect(data, (struct sockaddr *)&data_addr,
+                   sizeof(data_addr)) < 0) {
+                       perror("ftp: connect");
+                       goto bad;
+               }
+               return(0);
        }
 
 
@@ -1262,26 +1262,26 @@ bad:
 
 int dataconn(const char *mode)
 {
-   struct sockaddr_in from;
-   int s, fromlen = sizeof (from);
-
-   if (passivemode)
-     return (data);
-
-   s = accept(data, (struct sockaddr *) &from, &fromlen);
-   if (s < 0) {
-      perror("ftp: accept");
-      (void) closesocket(data), data = -1;
-      return (int) (NULL);
-   }
+       struct sockaddr_in from;
+       int s, fromlen = sizeof (from);
+
+       if (passivemode)
+               return (data);
+
+       s = accept(data, (struct sockaddr *) &from, &fromlen);
+       if (s < 0) {
+               perror("ftp: accept");
+               (void) closesocket(data), data = -1;
+               return (int) (NULL);
+       }
        if(closesocket(data)) {
                int iret=WSAGetLastError ();
                fprintf(stdout,"Error closing socket(%d)\n",iret);
                (void) fflush(stdout);
        }
 
-   data = s;
-   return (data);
+       data = s;
+       return (data);
 }
 
 void ptransfer(direction, bytes, t0, t1)
@@ -1356,7 +1356,7 @@ void pswitch(int flag)
        struct comvars *ip, *op;
 
        abrtflag = 0;
-    oldintr = signal(SIGINT, psabort);
+       oldintr = signal(SIGINT, psabort);
        if (flag) {
                if (proxy)
                        return;
@@ -1415,7 +1415,7 @@ void pswitch(int flag)
        (void) strncpy(ip->mo, mapout, MAXPATHLEN - 1);
        (ip->mo)[strlen(ip->mo)] = '\0';
        (void) strcpy(mapout, op->mo);
-//        (void) signal(SIGINT, oldintr);
+//     (void) signal(SIGINT, oldintr);
        if (abrtflag) {
                abrtflag = 0;
                (*oldintr)(1);
@@ -1816,5 +1816,5 @@ gunique(local)
 
 int null(void)
 {
-   return 0;
+       return 0;
 }
index def90bb..b42e365 100644 (file)
@@ -102,36 +102,36 @@ VOID CSocket::Close()
 // Constructor with serversocket as parameter
 CServerClientSocket::CServerClientSocket(LPCServerSocket lpServerSocket)
 {
-       ServerSocket = lpServerSocket;
+    ServerSocket = lpServerSocket;
 }
 
 // Transmit data to socket
-INT CServerClientSocket::Transmit( LPSTR lpsBuffer, UINT nLength)
+INT CServerClientSocket::Transmit( LPCSTR lpsBuffer, UINT nLength)
 {
     return send(Socket, lpsBuffer, nLength, 0);
 }
 
 // Send a string to socket
-INT CServerClientSocket::SendText( LPSTR lpsText)
+INT CServerClientSocket::SendText( LPCSTR lpsText)
 {
     static CHAR crlf[3] = {0x0D, 0x0A, 0x00};
-       INT nCount;
+    INT nCount;
 
     nCount = Transmit(lpsText, strlen(lpsText));
-       nCount += Transmit(crlf, strlen(crlf));
-       return nCount;
+    nCount += Transmit(crlf, strlen(crlf));
+    return nCount;
 }
 
 // Receive data from socket
 INT CServerClientSocket::Receive(LPSTR lpsBuffer, UINT nLength)
 {
-       return recv(Socket, lpsBuffer, nLength, 0);
+    return recv(Socket, lpsBuffer, nLength, 0);
 }
 
 // Process winsock messages if any
 VOID CServerClientSocket::MessageLoop()
 {
-       UINT nStatus;
+    UINT nStatus;
     WSANETWORKEVENTS NetworkEvents;
 
     nStatus = WSAWaitForMultipleEvents(1, &Event, FALSE, 0, FALSE);
index 2aa43bd..1801a6c 100644 (file)
@@ -41,7 +41,7 @@ CHttpClient::CHttpClient(CServerSocket *serversocket)
 VOID CHttpClient::SplitUri(LPSTR lpsUri, LPSTR lpsHost, LPSTR lpsResource, LPSTR lpsParams)
 {
     LPSTR lpsPos;
-       LPSTR lpsStr;
+    LPSTR lpsStr;
     UINT i;
 
        strcpy(lpsHost, "");
@@ -118,7 +118,7 @@ VOID CHttpClient::SplitResource(LPSTR lpsResource, LPSTR lpsPath, LPSTR lpsFilen
 VOID CHttpClient::ProcessRequest()
 {
     CHAR sStr[255];
-       CHAR sHost[255];
+    CHAR sHost[255];
     CHAR sResource[255];
     CHAR sParams[255];
 
@@ -145,7 +145,7 @@ VOID CHttpClient::ProcessRequest()
                                }
                        }
                        strcpy(sStr, pConfiguration->GetHttpBase());
-               strcat(sStr, sResource);
+                       strcat(sStr, sResource);
                        SendFile(sStr);
                        break;
                }
@@ -212,7 +212,7 @@ VOID CHttpClient::SendFile(LPSTR lpsFilename)
                return;
        }
 
-       SendText("HTTP/1.1 200 OK");
+    SendText("HTTP/1.1 200 OK");
     SendText("Server: ROSHTTPD");
     SendText("MIME-version: 1.0");
     SendText("Content-Type: text/plain");
@@ -260,7 +260,7 @@ VOID CHttpClient::SendFile(LPSTR lpsFilename)
 }
 
 // Report something to client
-VOID CHttpClient::Report(LPSTR lpsCode, LPSTR lpsStr)
+VOID CHttpClient::Report(LPCSTR lpsCode, LPSTR lpsStr)
 {
     CHAR sTmp[128];
     CHAR sTmp2[16];
index 1996517..ff85940 100644 (file)
@@ -37,7 +37,7 @@ public:
        void SplitResource(const LPSTR lpsResource, LPSTR lpsPath, LPSTR lpsFilename, LPSTR lpsExtension);
     void ProcessRequest();
     void SendFile(const LPSTR lpsFilename);
-    void Report(const LPSTR lpsCode, const LPSTR lpsStr);
+    void Report(LPCSTR lpsCode, const LPSTR lpsStr);
 private:
        BOOL bStop;
        LPSTR lpsBuffer;
index da6a40e..db15fe9 100644 (file)
@@ -82,9 +82,9 @@ public:
     virtual VOID SetPort( UINT nPort) {};
        virtual VOID Open();
        virtual VOID Close();
-       virtual INT Transmit( LPSTR lpsBuffer,  UINT nLength) { return 0; };
+       virtual INT Transmit( LPCSTR lpsBuffer,  UINT nLength) { return 0; };
        virtual INT Receive(LPSTR lpsBuffer,  UINT nLength) { return 0; };
-       virtual INT SendText( LPSTR lpsStr) { return 0; };
+       virtual INT SendText( LPCSTR lpsStr) { return 0; };
 protected:
        SOCKET Socket;
        SOCKADDR_IN SockAddrIn;
@@ -100,9 +100,9 @@ public:
        CServerClientSocket() {};
        CServerClientSocket(LPCServerSocket lpServerSocket);
        CServerSocket *GetServerSocket();
-       virtual INT Transmit( LPSTR lpsBuffer,  UINT nLength);
+       virtual INT Transmit( LPCSTR lpsBuffer,  UINT nLength);
        virtual INT Receive(LPSTR lpsBuffer,  UINT nLength);
-       virtual INT SendText( LPSTR lpsText);
+       virtual INT SendText( LPCSTR lpsText);
        virtual VOID MessageLoop();
        virtual VOID OnRead() {};
        //virtual VOID OnWrite() {};
index 24fabdb..ab11fca 100644 (file)
@@ -417,7 +417,7 @@ unsigned long TConsole::WriteStringFast(const char* pszString, unsigned long cbS
                if(ini.get_vt100_mode() && cbString + (unsigned)CON_CUR_X == (unsigned)CON_COLS) {
 
                        cbString--;
-                       if(cbString >= 0) WriteConsole(hConsole, pszString, cbString, &Result, 0);
+                       if((long)cbString >= 0) WriteConsole(hConsole, pszString, cbString, &Result, 0);
 
                        COORD dwBufferCoord;
                        dwBufferCoord.X = 0;
index 9762bd1..805736e 100644 (file)
@@ -1,10 +1,10 @@
 LIBRARY clb.dll
 
 EXPORTS
-ClbAddData@12 @1
-ClbSetColumnWidths@12 @2
-ClbStyleW@8 @3
-ClbWndProc@16 @4
-CustomControlInfoW@4 @5
+ClbAddData @1
+ClbSetColumnWidths @2
+ClbStyleW @3
+ClbWndProc @4
+CustomControlInfoW @5
 
 ; EOF
index 410b138..fcc7d99 100644 (file)
@@ -18,8 +18,8 @@
  */
 
 #include <windows.h>
-#include <gl.h>
-#include <glu.h>
+#include <GL/gl.h>
+#include <GL/glu.h>
 #include <tchar.h>
 
 #define APPNAME _T("Cylfrac")
@@ -159,9 +159,9 @@ LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
                case WM_PAINT:
                {
                        DWORD ticks = oldticks;
+                       POINT currpoint;
                        oldticks = GetTickCount();
                        DrawScene(hwnd, dc, oldticks - ticks);
-                       POINT currpoint;
                        if(fullscreen)
                        {
                                GetCursorPos(&currpoint);
@@ -187,10 +187,11 @@ LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
                {
                        int width = LOWORD(lParam);
                        int height = HIWORD(lParam);
+                       float fscale;
                        glViewport(0, 0, width, height);
                        glMatrixMode(GL_MODELVIEW);
                        glLoadIdentity();
-                       float fscale = 0.8/(float)lvls;
+                       fscale = 0.8/(float)lvls;
                        glScalef(fscale, fscale, fscale);
                        break;
                }
@@ -236,7 +237,12 @@ void InitSaver(HWND hwndParent)
 
 void ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent)
 {
-       int ch = *szCmdLine++;
+       int ch;
+       
+       if (!strlen(szCmdLine))
+               return;
+
+       ch = *szCmdLine++;
 
        if(ch == '-' || ch == '/')
                ch = *szCmdLine++;
@@ -245,6 +251,10 @@ void ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent)
                ch += 'a' - 'A';
 
        *chOption = ch;
+
+       if (ch == 's' || ch == 'c')
+               return;
+
        ch = *szCmdLine++;
 
        if(ch == ':')
@@ -268,7 +278,7 @@ int WINAPI WinMain (HINSTANCE hInst,
                     int iCmdShow)
 {
        HWND    hwndParent;
-       int     chOption;
+       int     chOption = 0;
        MSG     Message;
 
        hInstance = hInst;
index eb37a6b..f55f619 100644 (file)
@@ -72,10 +72,13 @@ ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
          * subtract it from our clip rect because we don't
          * use icons in this list control.
          */
-        (void)ListView_GetItemRect(hWnd, 0, &rcClip, LVIR_BOUNDS);
-        (void)ListView_GetItemRect(hWnd, ListView_GetItemCount(hWnd) - 1, &rcItem, LVIR_BOUNDS);
-        rcClip.bottom = rcItem.bottom;
-        (void)ListView_GetItemRect(hWnd, 0, &rcItem, LVIR_ICON);
+       rcClip.left = LVIR_BOUNDS;
+       SendMessage(hWnd, LVM_GETITEMRECT, 0, (LPARAM)&rcClip);
+       rcClip.left = LVIR_BOUNDS;
+       SendMessage(hWnd, LVM_GETITEMRECT, ListView_GetItemCount(hWnd) - 1, (LPARAM)&rcItem);
+       rcClip.bottom = rcItem.bottom;
+       rcClip.left = LVIR_ICON;
+       SendMessage(hWnd, LVM_GETITEMRECT, 0, (LPARAM)&rcItem);
         rcClip.left = rcItem.right;
 
         /*
index 0e4b8c1..447c389 100644 (file)
@@ -85,11 +85,11 @@ int Generate()
        HANDLE hFile = NULL;
        BOOL fReturnValue;
 
-       char *szxReplacedFile = "c:\\testFileIsReplaced";
-       char *szxMovedFileWithRepl = "c:\\testFileShouldBeMovedW";
-       char *szxMovedFile = "c:\\testFileShouldBeMoved";
-       char *szxNewMovedFile = "c:\\testFileIsMoved";
-       char *szxDeletedFile = "c:\\testFileShouldBeDeleted";
+       const char szxReplacedFile[] = "c:\\testFileIsReplaced";
+       const char szxMovedFileWithRepl[] = "c:\\testFileShouldBeMovedW";
+       const char szxMovedFile[] = "c:\\testFileShouldBeMoved";
+       const char szxNewMovedFile[] = "c:\\testFileIsMoved";
+       const char szxDeletedFile[] = "c:\\testFileShouldBeDeleted";
 
        memset(sBuf, 0xaa, sizeof(sBuf));
 
index abb7841..1e4e18e 100644 (file)
@@ -1,3 +1,4 @@
+#include <windows.h>
 #include <conio.h>
 #include <io.h>
 #include <stdio.h>
@@ -502,7 +503,7 @@ applyPatch_file_open_error:
          if (c == 'y')
          {
             char buffer[MAX_PATH];
-            snprintf(buffer, MAX_PATH, "%s.bak", fileName);
+            _snprintf(buffer, MAX_PATH, "%s.bak", fileName);
             buffer[MAX_PATH-1] = '\0';
             makeBackup = 1;
             if (access(buffer, 0) >= 0) /* file exists */
index 2d962a4..354ac7e 100644 (file)
@@ -305,12 +305,12 @@ CreateFreeLoaderIniForDos(PWCHAR IniPath,
                    L"SystemPath",
                    ArcPath);
 
-  /* Options=/DEBUGPORT=SCREEN /NOGUIBOOT */
+  /* Options=/DEBUGPORT=SCREEN /NOGUIBOOT /SOS*/
   IniCacheInsertKey(IniSection,
                    NULL,
                    INSERT_LAST,
                    L"Options",
-                   L"/DEBUGPORT=SCREEN /NOGUIBOOT");
+                   L"/DEBUGPORT=SCREEN /SOS");
 
   /* Create "DOS" section */
   IniSection = IniCacheAppendSection(IniCache,
@@ -416,12 +416,12 @@ CreateFreeLoaderIniForReactos(PWCHAR IniPath,
                    L"SystemPath",
                    ArcPath);
 
-  /* Options=/DEBUGPORT=SCREEN /NOGUIBOOT */
+  /* Options=/DEBUGPORT=COM1 /NOGUIBOOT /SOS*/
   IniCacheInsertKey(IniSection,
                    NULL,
                    INSERT_LAST,
                    L"Options",
-                   L"/DEBUGPORT=COM1 /NOGUIBOOT");
+                   L"/DEBUGPORT=COM1 /NOGUIBOOT /SOS");
 
   /* Save the ini file */
   IniCacheSave(IniCache, IniPath);
index 5184e0d..3445ade 100644 (file)
@@ -636,14 +636,14 @@ EnumerateBiosDiskEntries(PPARTLIST PartList)
 
                       InsertTailList(&PartList->BiosDiskListHead, &BiosDiskEntry->ListEntry);
 
-                      DPRINT("DiskNumber:        %d\n", BiosDiskEntry->DiskNumber);
-                      DPRINT("Signature:         %08x\n", BiosDiskEntry->Signature);
-                      DPRINT("Checksum:          %08x\n", BiosDiskEntry->Checksum);
-                      DPRINT("BytesPerSector:    %d\n", BiosDiskEntry->DiskGeometry.BytesPerSector);
-                      DPRINT("NumberOfCylinders: %d\n", BiosDiskEntry->DiskGeometry.NumberOfCylinders);
-                      DPRINT("NumberOfHeads:     %d\n", BiosDiskEntry->DiskGeometry.NumberOfHeads);
+                      DPRINT("DiskNumber:        %lu\n", BiosDiskEntry->DiskNumber);
+                      DPRINT("Signature:         %08lx\n", BiosDiskEntry->Signature);
+                      DPRINT("Checksum:          %08lx\n", BiosDiskEntry->Checksum);
+                      DPRINT("BytesPerSector:    %lu\n", BiosDiskEntry->DiskGeometry.BytesPerSector);
+                      DPRINT("NumberOfCylinders: %lu\n", BiosDiskEntry->DiskGeometry.NumberOfCylinders);
+                      DPRINT("NumberOfHeads:     %lu\n", BiosDiskEntry->DiskGeometry.NumberOfHeads);
                       DPRINT("DriveSelect:       %02x\n", BiosDiskEntry->Int13DiskData.DriveSelect);
-                      DPRINT("MaxCylinders:      %d\n", BiosDiskEntry->Int13DiskData.MaxCylinders);
+                      DPRINT("MaxCylinders:      %lu\n", BiosDiskEntry->Int13DiskData.MaxCylinders);
                       DPRINT("SectorsPerTrack:   %d\n", BiosDiskEntry->Int13DiskData.SectorsPerTrack);
                       DPRINT("MaxHeads:          %d\n", BiosDiskEntry->Int13DiskData.MaxHeads);
                       DPRINT("NumberDrives:      %d\n", BiosDiskEntry->Int13DiskData.NumberDrives);
index a64d648..e8d130b 100755 (executable)
@@ -129,7 +129,7 @@ WinMain(HINSTANCE hInst,
   wndclass.cbWndExtra = 0;
   wndclass.hInstance = hInstance;
   wndclass.hIcon = hMainIcon;
-  wndclass.hCursor = LoadCursor (NULL, MAKEINTRESOURCE(IDC_ARROW));
+  wndclass.hCursor = LoadCursor (NULL, IDC_ARROW);
   wndclass.hbrBackground = 0;
   wndclass.lpszMenuName = NULL;
   wndclass.lpszClassName = szFrameClass;
index 94ff204..cee5c84 100644 (file)
@@ -4,6 +4,8 @@
        <define name="__USE_W32API" />
        <define name="ANONYMOUSUNIONS" />
        <define name="_WIN32_WINNT">0x0501</define>
+       <define name="UNICODE" />
+       <define name="_UNICODE" />
        <pch>precomp.h</pch>
        <compilationunit name="unit.c">
                <file>alias.c</file>
@@ -67,6 +69,8 @@
        <define name="__USE_W32API" />
        <define name="ANONYMOUSUNIONS" />
        <define name="_WIN32_WINNT">0x0501</define>
+       <define name="UNICODE" />
+       <define name="_UNICODE" />
        <library>cmd_base</library>
        <library>kernel32</library>
        <library>advapi32</library>
index 6a0ae7a..f7b2fc3 100644 (file)
@@ -12,6 +12,9 @@
  *
  *    01-Jul-2005 (Brandon Turner) <turnerb7@msu.edu>)
  *        Added ConPrintfPaging and ConOutPrintfPaging
+ *
+ *    02-Feb-2007 (Paolo Devoti) <devotip at gmail.com>)
+ *        Fixed ConPrintfPaging
  */
  
  
@@ -238,10 +241,13 @@ VOID ConPrintf(LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle)
 INT ConPrintfPaging(BOOL NewPage, LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle)
 {
        INT len;
-       PTCHAR pBuf;
-       CONSOLE_SCREEN_BUFFER_INFO csbi;
        TCHAR szOut[OUTPUT_BUFFER_SIZE];
        DWORD dwWritten;
+       CONSOLE_SCREEN_BUFFER_INFO csbi;
+#ifdef _UNICODE
+       INT WideLen;
+       PCHAR pBuf;
+#endif
  
   /* used to count number of lines since last pause */
        static int LineCount = 0;
@@ -252,8 +258,8 @@ INT ConPrintfPaging(BOOL NewPage, LPTSTR szFormat, va_list arg_ptr, DWORD nStdHa
   /* the number of chars in a roow */
        int ScreenCol = 0;  
  
-  /* chars since end of line */
-       int CharEL = 0; 
+  /* chars since start of line */
+       int CharSL = 0; 
  
        int i = 0;
  
@@ -261,73 +267,70 @@ INT ConPrintfPaging(BOOL NewPage, LPTSTR szFormat, va_list arg_ptr, DWORD nStdHa
                LineCount = 0;
  
   /* rest LineCount and return if no string have been given */
-        if (szFormat == NULL)
-                return 0;
+    if (szFormat == NULL)
+            return 0;
+  
        //get the size of the visual screen that can be printed too
        if (!GetConsoleScreenBufferInfo(hConsole, &csbi))
-        {
-                // we assuming its a file handle
-                ConPrintf(szFormat, arg_ptr, nStdHandle);
-                return 0;
-        }
+    {
+        // we assuming its a file handle
+        ConPrintf(szFormat, arg_ptr, nStdHandle);
+        return 0;
+    }
        //subtract 2 to account for "press any key..." and for the blank line at the end of PagePrompt()
        ScreenLines = (csbi.srWindow.Bottom  - csbi.srWindow.Top) - 4;
        ScreenCol = (csbi.srWindow.Right - csbi.srWindow.Left) + 1;
  
        //make sure they didnt make the screen to small 
        if(ScreenLines<4)
-        {
-               ConPrintf(szFormat, arg_ptr, nStdHandle);
-                return 0;
-        }
+    {
+           ConPrintf(szFormat, arg_ptr, nStdHandle);
+            return 0;
+    }
  
        len = _vstprintf (szOut, szFormat, arg_ptr);
-       pBuf = szOut;
+
+
+#ifdef _UNICODE
+       pBuf = malloc(len + 1);
+#endif
  
        for(i = 0; i < len; i++)
-       { 
-                if(pBuf[i] == _T('\n'))
-               {                               
-                       LineCount++; 
-                        CharEL=0;
-               }      
-                else
-                {      
-                        CharEL++;           
-                        if (CharEL>=ScreenCol)
-                        {        
-                                if (i+1<len)
-                                {
-                                        if(pBuf[i+1] != _T('\n')) LineCount++;          
-                                }
-                                CharEL=0;
-                        }
-                }
-                /* FIXME : write more that one char at time */
-                WriteFile (GetStdHandle (nStdHandle),&pBuf[i],sizeof(CHAR),&dwWritten,NULL);
-               if(LineCount >= ScreenLines)
-               {
-                        if(_tcsnicmp(&pBuf[i], _T("\n"), 2)!=0)
-                        WriteFile (GetStdHandle (nStdHandle),_T("\n"),sizeof(CHAR),&dwWritten,NULL); 
-                       if(PagePrompt() != PROMPT_YES)
-                       {
-                               return 1;
-                       }
-                       //reset the number of lines being printed         
-                       LineCount = 0;
-                        CharEL=0;
-               }
+       {
+               // search 'end of string' '\n' or 'end of screen line'
+               for(; (i < len) && (szOut[i] != _T('\n') && (CharSL<ScreenCol)) ; i++)
+                       CharSL++;
+
+#ifdef _UNICODE
+               WideLen = WideCharToMultiByte( OutputCodePage, 0, &szOut[i-CharSL], CharSL + 1, pBuf, CharSL + 1, NULL, NULL);
+               WriteFile (GetStdHandle (nStdHandle),pBuf,WideLen,&dwWritten,NULL);
+#else
+               WriteFile (GetStdHandle (nStdHandle),&szOut[i-CharSL],sizeof(CHAR)*(CharSL+1),&dwWritten,NULL);
+#endif
+
+               LineCount++;
+
+           if(LineCount >= ScreenLines)
+           {
+            if(_tcsnicmp(&szOut[i], _T("\n"), 2)!=0)
+                               WriteFile (GetStdHandle (nStdHandle),_T("\n"),sizeof(CHAR),&dwWritten,NULL); 
+
+                   if(PagePrompt() != PROMPT_YES)
+                   {
+                           break;
+                   }
+                   //reset the number of lines being printed         
+                   LineCount = 0;
+           }
+        CharSL=0;
        }
  
 #ifdef _UNICODE
        free(pBuf);
 #endif
+       if (i < len) //!= PROMPT_YES
+               return 1;
+
        return 0;
 }
  
index e70e1bc..59cdc71 100644 (file)
  *
  *    1-Jul-2004 (Brandon Turner <turnerb7@msu.edu>)
  *        Added /p back in using ConOutPrintfPaging
+ *
+ *    3-feb-2007 (Paolo Devoti devotip at gmail)
+ *        Removed variables formerly in use to handle pagination
+ *               Pagination belongs to ConOutPrintfPaging
+ *               Removed already commented out code of old pagination
  */
 
 #include <precomp.h>
@@ -801,55 +806,13 @@ DirParsePathspec (LPTSTR szPathspec, LPTSTR szPath, LPTSTR szFilespec)
 }
 
 
-/*
- * incline
- *
- * increment our line if paginating, display message at end of screen
- */
-#if 0
-static BOOL
-IncLine (LPINT pLine, LPDIRSWITCHFLAGS lpFlags)
-{
-       BOOL bError;
-       CONSOLE_SCREEN_BUFFER_INFO lpConsoleScreenBufferInfo;
-       LONG WindowHeight;
-
-       bError = GetConsoleScreenBufferInfo(hConsole, &lpConsoleScreenBufferInfo);
-
-       WindowHeight = lpConsoleScreenBufferInfo.srWindow.Bottom - lpConsoleScreenBufferInfo.srWindow.Top;
-
-       /* That prevents bad behiour if WindowHeight could not be calculated */
-       if (!WindowHeight)
-       {
-                WindowHeight= 1000000;
-       }
-
-       if (!(lpFlags->bPause))
-               return FALSE;
-
-       (*pLine)++;
-
-       /*
-        * Because I don't know if WindowsHeight work in all cases,
-        * perhaps then maxy is the right value
-        */
-       if (*pLine >= (int)maxy - 2 || *pLine >= WindowHeight)
-       {
-               *pLine = 0;
-               return (PagePrompt () == PROMPT_BREAK);
-       }
-
-       return FALSE;
-}
-#endif
-
 /*
  * PrintDirectoryHeader
  *
  * print the header for the dir command
  */
 static BOOL
-PrintDirectoryHeader(LPTSTR szPath, LPINT pLine, LPDIRSWITCHFLAGS lpFlags)
+PrintDirectoryHeader(LPTSTR szPath, LPDIRSWITCHFLAGS lpFlags)
 {
   TCHAR szMsg[RC_STRING_MAX_SIZE];
   TCHAR szRootName[MAX_PATH];
@@ -1114,7 +1077,6 @@ PrintSummary(LPTSTR szPath,
             ULONG ulFiles,
             ULONG ulDirs,
             ULARGE_INTEGER u64Bytes,
-            LPINT pLine,
             LPDIRSWITCHFLAGS lpFlags)
 {
        TCHAR szMsg[RC_STRING_MAX_SIZE];
@@ -1768,7 +1730,6 @@ QsortFiles(LPWIN32_FIND_DATA ptrArray[],  /* [IN/OUT] The array with file info po
 static INT
 DirList(LPTSTR szPath,                 /* [IN] The path that dir starts */
                LPTSTR szFilespec,              /* [IN] The type of file that we are looking for */
-               LPINT pLine,                    /* FIXME: Maybe used for paginating */
                LPDIRSWITCHFLAGS lpFlags)       /* [IN] The flags of the listing */
 {
        HANDLE hSearch;                                                 /* The handle of the search */
@@ -1950,7 +1911,7 @@ ULARGE_INTEGER u64Temp;                                   /* A temporary counter */
                                        _tcscpy(szFullFileSpec, szFullPath);
                                        _tcscat(szFullFileSpec, wfdFileInfo.cFileName);
                                        /* We do the same for tha folder */
-                                       if (DirList(szFullFileSpec, szFilespec, pLine,lpFlags) != 0)
+                                       if (DirList(szFullFileSpec, szFilespec, lpFlags) != 0)
                                        {
                                                return 1;
                                        }
@@ -1988,7 +1949,6 @@ CommandDir(LPTSTR first, LPTSTR rest)
        TCHAR   szFilespec[MAX_PATH];
        LPTSTR* params;
        INT             entries = 0;
-       INT             nLine = 0;
        UINT    loop = 0;
        DIRSWITCHFLAGS stFlags;
 
@@ -2078,7 +2038,7 @@ CommandDir(LPTSTR first, LPTSTR rest)
 
                /* Print the drive header if the drive changed */
                if(cDrive != szPath[0] && !stFlags.bBareFormat) {
-                       if (!PrintDirectoryHeader (szPath, &nLine, &stFlags)) {
+                       if (!PrintDirectoryHeader (szPath, &stFlags)) {
                                nErrorLevel = 1;
                                return 1;
                        }
@@ -2088,7 +2048,7 @@ CommandDir(LPTSTR first, LPTSTR rest)
                
 
                /* do the actual dir */
-               if (DirList (szPath, szFilespec, &nLine, &stFlags))
+               if (DirList (szPath, szFilespec, &stFlags))
                {
                        nErrorLevel = 1;
                        return 1;
@@ -2100,7 +2060,6 @@ CommandDir(LPTSTR first, LPTSTR rest)
                recurse_file_cnt,
                recurse_dir_cnt,
                recurse_bytes,
-               &nLine,
                &stFlags);
        
        return 0;
index f14426d..c62943c 100644 (file)
@@ -28,7 +28,7 @@ Per visualizzare tutti gli alias:\n\
 Per attivarne uno nuovo o sostituire uno esistente:\n\
   ALIAS da=dir a:\n\n\
 Per rimuovere un alias:\n\
-  ALIAS da="
+  ALIAS da=\n"
 
 STRING_BEEP_HELP, "Segnale acustico.\n\nBEEP\n"
 
@@ -107,7 +107,7 @@ dec  esa  name       dec  esa  nome\n\
 
 STRING_COPY_HELP1,  "Sovrascrivi %s (Si/No/Tutti)? "
 
-STRING_COPY_HELP2, "Copia uno o piu' file in un'altra destinazione.\n\n\
+STRING_COPY_HELP2, "Copia uno o più file in un'altra destinazione.\n\n\
 COPY [/V][/Y|/-Y][/A|/B] sorgente [/A|/B]\n\
      [+ sorgente [/A|/B] [+ ...]] [destinazione [/A|/B]]\n\n\
   sorgente     Inica il file o i file da copiare.\n\
@@ -134,7 +134,7 @@ DATE [/T][data]\n\n\
 Scrivi  DATE senza parametri per visualizzare la data attuale e\n\
 chiedere quella nuova. Premi ENTER per mantenerla inalterata.\n"
                                
-STRING_DEL_HELP1,  "Cancella uno o piu' file.\n\n\
+STRING_DEL_HELP1,  "Cancella uno o più file.\n\n\
 DEL [/N /P /T /Q /S /W /Y /Z /A[[:]attributi]] file ...\n\
 DELETE [/N /P /T /Q /S /W /Y /Z /A[[:]attributi]] file ...\n\
 ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributi]] file ...\n\n\
@@ -155,9 +155,9 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributi]] file ...\n\n\
         H     nascosto\n\
         -     prefisso con il significato di non\n"
 
-STRING_DEL_HELP2, "All files in the directory will be deleted!\nAre you sure (Y/N)?"
-STRING_DEL_HELP3, "    %lu file deleted\n"
-STRING_DEL_HELP4, "    %lu files deleted\n"
+STRING_DEL_HELP2, "Tutti i file nella cartella saranno cancellati!\nSei sicuro (S/N)?"
+STRING_DEL_HELP3, "    %lu file cancellato\n"
+STRING_DEL_HELP4, "    %lu file cancellati\n"
 
 STRING_DELAY_HELP, "aspetta per il tempo indicato in secondi o millisecondi\n\
 DELAY [/m]n\n\n\
@@ -179,8 +179,8 @@ STRING_DIR_HELP1, "DIR [disco:][percorso][nomefilen] [/A[[:]attributi]] [/B] [/C
   /L          Usa minuscole.\n\
   /N          Nuovo formato con i nomi dei file sulla estrema destra.\n\
   /O          Elenca i file ordinati.\n\
-  sortorder    N  Per nome (alfabetico)    S  Dimensione (per primo il piu' piccolo)\n\
-               E  Estensione (alfabetico)  D  By date/time (per primo il piu' vecchio)\n\
+  sortorder    N  Per nome (alfabetico)    S  Dimensione (per primo il più piccolo)\n\
+               E  Estensione (alfabetico)  D  By date/time (per primo il più vecchio)\n\
                G  Le cartelle per prime    -  Prefisso per invertire l'ordine\n\
   /P          Pasa dopo ogni schermata piena.\n\
   /Q          Visualizza il proprietario del file.\n\
@@ -244,7 +244,7 @@ STRING_EXIT_HELP, "Esce dall'interprete dei comandi.\n\n\
 STRING_FOR_HELP1, "Esegue un comand specifico per ogni file indicato\n\n\
 FOR %variabile IN (listafile) DO comando [parametri]\n\n\
   %variabile Indica un parametro sostituibile.\n\
-  (listafile)Indica un insieme di uno o piu' file. Si possono usare i\
+  (listafile)Indica un insieme di uno o più file. Si possono usare i\
              caratteri jolly.\n\
   comando    Indica un comando da eseguire per ogni file.\n\
   parametri  Indica i parametri o le selezioni per il comando.\n\n\
@@ -309,7 +309,7 @@ STRING_MISC_HELP1, "Premi un tasto per continuare...\n"
 STRING_MOVE_HELP1, "Sovrascrivi %s (Si/No/Tutti)? "
 
 STRING_MOVE_HELP2, "Sposta i file o cambia il nome a file e cartelle.\n\n\
-Per spostare uno o piu' file:\n\
+Per spostare uno o più file:\n\
 MOVE [/N][disco:][percorso]nomefile1[,...] destinazione\n\n\
 To rename a directory:\n\
 MOVE [/N][disco:][percorso]]cartella1 cartella2\n\n\
@@ -421,7 +421,7 @@ stringa      Indica il titolo.\n"
 STRING_TIME_HELP1, "Visualizza o assegna l'ora di sistema.\n\n\
 TIME [/T][ora]\n\n\
   /T    Visualizza solo\n\n\
-Se TIME è usato senza parametri viene visualizzata l'ra attuale e richiesta\n\
+Se TIME è usato senza parametri viene visualizzata l'ora attuale e richiesta\n\
 quella nuova. Premere INVIO per non modificarla.\n"
 
 STRING_TIME_HELP2, "Inserisci la nuova ora: "
@@ -526,12 +526,12 @@ CHOICE   Aspetta che l'utente scelga una tra le opzioni disponibili.\n\
 CLS      Cancella lo schermo.\n\
 CMD      Esegue un altro interprete dei comandi.\n\
 COLOR    Imposta i colori della console.\n\
-COPY     Copia uno o piu' file in un'altra destinazione.\n\
+COPY     Copia uno o più file in un'altra destinazione.\n\
 DATE     Visualizza o modifica la data.\n\
-DELETE   Cancella uno o piu' file.\n\
+DELETE   Cancella uno o più file.\n\
 DIR      Visualizza un elenco di file e sottocartelle in una cartella.\n\
 ECHO     Visualizza messaggi, o abilita e disabilita la visualizzazione dei comandi.\n\
-ERASE    Cancella uno o piu' file.\n\
+ERASE    Cancella uno o più file.\n\
 EXIT     Esce dall'interprete dei comandi.\n\
 FOR      Esegue un comando per ognuno dei file indicati.\n\
 FREE     Spazio libero.\n\
@@ -542,7 +542,7 @@ IF       Esegue elaborazioni condizionali in un batch.\n\
 LABEL    Crea, modifica, o cancella l'etichetta di un disco.\n\
 MD       Crea una cartella.\n\
 MKDIR    Crea una cartella.\n\
-MOVE     Muove uno o piu' file da una cartella a un'altra\n\
+MOVE     Muove uno o più file da una cartella a un'altra\n\
 PATH     Visualizza o imposta i percorsi di ricerca per gli eseguibili.\n\
 PAUSE    Ferma l'esecuzione di un batch e visualizza un messaggio.\n\
 POPD     Ripristina il valore precedente della cartella corrente salvato da\n\
@@ -551,8 +551,8 @@ PROMPT   Cambia il messaggio di pronto per i comandi.\n\
 PUSHD    Salva la cartella corrente e poi la cambia.\n\
 RD       Rimuove una cartella.\n\
 REM      Commenti in un batch.\n\
-REN      Rinomina uno piu' file.\n\
-RENAME   Rinomina uno piu' file.\n\
+REN      Rinomina uno più file.\n\
+RENAME   Rinomina uno più file.\n\
 RMDIR    Rimuove una cartella.\n\
 SCREEN   Sposta il cursore e visualizza un testo.\n\
 SET      Visualizza, modifica, o cancella le variabili di ambiente.\n\
index 55c8c03..8fa1d60 100644 (file)
@@ -107,15 +107,18 @@ FindProgramDlg::FindProgramDlg(HWND hwnd)
 
        LV_COLUMN column = {LVCF_FMT|LVCF_WIDTH|LVCF_TEXT, LVCFMT_LEFT, 250};
 
-       column.pszText = _T("Name");
+       TCHAR lvColName[] = _T("Name");
+       column.pszText = lvColName;
        ListView_InsertColumn(_list_ctrl, 0, &column);
 
        column.cx = 300;
-       column.pszText = _T("Path");
+       TCHAR lvColPath[] = _T("Path");
+       column.pszText = lvColPath;
        ListView_InsertColumn(_list_ctrl, 1, &column);
 
        column.cx = 400;
-       column.pszText = _T("Menu Path");
+       TCHAR lvColMenuPath[] = _T("Menu Path");
+       column.pszText = lvColMenuPath;
        ListView_InsertColumn(_list_ctrl, 2, &column);
 
        ListView_SetExtendedListViewStyleEx(_list_ctrl, LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT);
index 6fc4319..a85f146 100644 (file)
@@ -366,7 +366,7 @@ BEGIN
     IDS_MINIMIZE_ALL        "mimimiser toutes les fenêtres"
     IDS_DESKTOP_NUM         "Bureau %d"
     IDS_VOLUME              "Volume"
-    IDS_ITEMS_CUR           "abjets actuels"
+    IDS_ITEMS_CUR           "objets actuels"
     IDS_ITEMS_CONFIGURED    "configuration"
     IDS_ITEMS_VISIBLE       "visible"
     IDS_ITEMS_HIDDEN        "caché"
index 2750513..a37104c 100644 (file)
@@ -1186,7 +1186,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
 
        /**TODO launching autostart programs can be moved into a background thread. */
        if (autostart) {
-               char* argv[] = {"", "s"};       // call startup routine in SESSION_START mode
+               const char* argv[] = {"", "s"}; // call startup routine in SESSION_START mode
                startup(2, argv);
        }
 
index ecda281..bfe5c60 100644 (file)
@@ -27,7 +27,7 @@
 
 
  // launch start programs
-extern "C" int startup(int argc, char *argv[]);
+extern "C" int startup(int argc, const char *argv[]);
 
  // load Shell Service Objects (volume control, printer/network icons, ...)
 struct SSOThread : public Thread
index ec0e422..207b4a0 100644 (file)
@@ -416,7 +416,7 @@ static const struct op_mask
     SETUP                      = {FALSE, FALSE, FALSE, TRUE, TRUE, TRUE};
 #define DEFAULT SESSION_START
 
-int startup(int argc, char *argv[])
+int startup(int argc, const char *argv[])
 {
     struct op_mask ops; /* Which of the ops do we want to perform? */
     /* First, set the current directory to SystemRoot */
index 439b28b..c6037f2 100644 (file)
@@ -865,7 +865,8 @@ MDIMainFrame::MDIMainFrame(HWND hwnd)
 #endif
        rbBand.fStyle = RBBS_CHILDEDGE|RBBS_GRIPPERALWAYS|RBBS_HIDETITLE;
 
-       rbBand.lpText = TEXT("Extras");
+       TCHAR ExtrasBand[] = _T("Extras");
+       rbBand.lpText = ExtrasBand;
        rbBand.hwndChild = _hextrabar;
        rbBand.cxMinChild = 0;
        rbBand.cyMinChild = btn_hgt;
@@ -874,7 +875,8 @@ MDIMainFrame::MDIMainFrame(HWND hwnd)
 
 #ifndef _NO_WIN_FS
        rbBand.fStyle |= RBBS_BREAK;
-       rbBand.lpText = TEXT("Drives");
+       TCHAR DrivesBand[] = _T("Drives");
+       rbBand.lpText = DrivesBand;
        rbBand.hwndChild = _hdrivebar;
        rbBand.cxMinChild = 0;
        rbBand.cyMinChild = btn_hgt;
index e22d9ec..4cb3d33 100644 (file)
@@ -230,12 +230,14 @@ void NtObjDirectory::read_directory(int scan_flags)
                        if (info->name.string_ptr) {
                                info->name.string_ptr[info->name.string_len / sizeof(WCHAR)] = 0;
                        } else {
-                               info->name.string_ptr = TEXT("");
+                               TCHAR empty_string_ptr[] = _T("");
+                               info->name.string_ptr = empty_string_ptr;
                        }
                        if (info->type.string_ptr) {
                                info->type.string_ptr[info->type.string_len / sizeof(WCHAR)] = 0;
                        } else {
-                               info->type.string_ptr = TEXT("");
+                               TCHAR empty_string_ptr[] = _T("");
+                               info->type.string_ptr = empty_string_ptr;
                        }
                        lstrcpynW(p, info->name.string_ptr, COUNTOF(buffer));
 #else
index a4e4033..1580e3e 100644 (file)
@@ -133,7 +133,7 @@ void BrowserNavigator::goto_url(LPCTSTR url)
        else {
                _new_url = url;
 
-               _browser->Navigate(L"about:blank", NULL, NULL, NULL, NULL);
+               _browser->Navigate(BStr(L"about:blank"), NULL, NULL, NULL, NULL);
        }
 }
 
index d51c08c..1fa6e34 100644 (file)
@@ -148,13 +148,15 @@ LRESULT DesktopBar::Init(LPCREATESTRUCT pcs)
        rbBand.cxMinChild = rbBand.cyIntegral * 3;
        rbBand.fStyle = RBBS_VARIABLEHEIGHT|RBBS_GRIPPERALWAYS|RBBS_HIDETITLE;
 
-       rbBand.lpText = TEXT("Quicklaunch");
+       TCHAR QuickLaunchBand[] = _T("Quicklaunch");
+       rbBand.lpText = QuickLaunchBand;
        rbBand.hwndChild = _hwndQuickLaunch;
        rbBand.cx = 250;
        rbBand.wID = IDW_QUICKLAUNCHBAR;
        SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand);
 
-       rbBand.lpText = TEXT("Taskbar");
+       TCHAR TaskbarBand[] = _T("Taskbar");
+       rbBand.lpText = TaskbarBand;
        rbBand.hwndChild = _hwndTaskBar;
        rbBand.cx = 200;        //pcs->cx-_taskbar_pos-quicklaunch_width-(notifyarea_width+1);
        rbBand.wID = IDW_TASKTOOLBAR;
index e3de958..4442387 100644 (file)
  // Martin Fuchs, 23.07.2003
  //
 
+#ifdef __cplusplus
+
+#ifdef _MSC_VER
+#pragma warning(disable: 4786) // disable warnings about too long debug information symbols
+#endif
+
+ // STL headers for strings and streams
+#include <string>
+#include <iostream>
+using namespace std;
+
+#endif /* __cplusplus */
+
 
  // standard windows headers
 #define WIN32_LEAN_AND_MEAN
@@ -190,15 +203,6 @@ BOOL exists_path(LPCTSTR path);
 
 #ifdef __cplusplus
 
-#ifdef _MSC_VER
-#pragma warning(disable: 4786) // disable warnings about too long debug information symbols
-#endif
-
- // STL headers for strings and streams
-#include <string>
-#include <iostream>
-using namespace std;
-
  // containers
 #include <map>
 #include <set>
index e947451..29c79cd 100644 (file)
@@ -279,12 +279,12 @@ XMLNode* XMLNode::create_relative(const char* path)
 
 
  /// encode XML string literals
-std::string EncodeXMLString(const XS_String& str)
+std::string EncodeXMLString(const XS_String& str, bool cdata)
 {
        LPCXSSTR s = str.c_str();
        size_t l = XS_len(s);
 
-       if (l <= BUFFER_LEN) {
+       if (!cdata && l<=BUFFER_LEN) {
                LPXSSTR buffer = (LPXSSTR)alloca(6*sizeof(XS_CHAR)*XS_len(s));  // worst case "&quot;" / "&apos;"
                LPXSSTR o = buffer;
 
@@ -410,10 +410,10 @@ XS_String DecodeXMLString(const XS_String& str)
                                p += 5;
                        } else
                                *o++ = *p;
-               } else if (*p=='<' && !XS_nicmp(p+1,XS_TEXT("!CDATA["),7)) {
-                       p += 9;
-                       LPCXSSTR e = XS_strstr(p, XS_TEXT("]]>"));
+               } else if (*p=='<' && !XS_nicmp(p+1,XS_TEXT("![CDATA["),8)) {
+                       LPCXSSTR e = XS_strstr(p+9, XS_TEXT("]]>"));
                        if (e) {
+                               p += 9;
                                size_t l = e - p;
                                memcpy(o, p, l);
                                o += l;
index 0d224c9..a488bbf 100644 (file)
@@ -409,7 +409,7 @@ inline std::string get_utf8(const XS_String& s)
 
 #endif // XS_STRING_UTF8
 
-extern std::string EncodeXMLString(const XS_String& str);
+extern std::string EncodeXMLString(const XS_String& str, bool cdata=false);
 extern XS_String DecodeXMLString(const XS_String& str);
 
 
@@ -714,7 +714,7 @@ struct XMLNode : public XS_String
                        return super::find(x);
                }
 
-               XS_String get(const char* x, LPXSSTR def=XS_EMPTY_STR) const
+               XS_String get(const char* x, LPCXSSTR def=XS_EMPTY_STR) const
                {
                        const_iterator found = find(x);
 
@@ -728,7 +728,7 @@ struct XMLNode : public XS_String
         /// map of XML node attributes
        struct AttributeMap : public std::map<XS_String, XS_String>
        {
-               XS_String get(const char* x, LPXSSTR def=XS_EMPTY_STR) const
+               XS_String get(const char* x, LPCXSSTR def=XS_EMPTY_STR) const
                {
                        const_iterator found = find(x);
 
@@ -848,7 +848,7 @@ struct XMLNode : public XS_String
        }
 
         /// read only access to an attribute
-       template<typename T> XS_String get(const T& attr_name, LPXSSTR def=XS_EMPTY_STR) const
+       template<typename T> XS_String get(const T& attr_name, LPCXSSTR def=XS_EMPTY_STR) const
        {
                AttributeMap::const_iterator found = _attributes.find(attr_name);
 
@@ -940,9 +940,9 @@ struct XMLNode : public XS_String
                return DecodeXMLString(ret.c_str());
        }
 
-       void set_content(const XS_String& s)
+       void set_content(const XS_String& s, bool cdata=false)
        {
-               _content.assign(EncodeXMLString(s.c_str()));
+               _content.assign(EncodeXMLString(s.c_str(), cdata));
        }
 
 #ifdef XMLNODE_LOCATION
@@ -2391,10 +2391,10 @@ struct XMLWriter
                return _stack.top()._attributes[attr_name];
        }
 
-       void set_content(const XS_String& s)
+       void set_content(const XS_String& s, bool cdata=false)
        {
                if (!_stack.empty())
-                       _stack.top()._content = EncodeXMLString(s.c_str());
+                       _stack.top()._content = EncodeXMLString(s.c_str(), cdata);
        }
 
         // public for access in StackEntry
index f276278..8b153d0 100644 (file)
@@ -306,7 +306,7 @@ CheckVolume(
     }
 
     /* Call provider */
-    PrintString("  Verifying volume %S\n", DrivePath);
+    //PrintString("  Verifying volume %S\n", DrivePath);
     RtlInitUnicodeString(&DrivePathU, DrivePath);
     Status = ChkdskFunc(&DrivePathU,
                         TRUE, // FixErrors
@@ -360,11 +360,11 @@ _main(int argc,
         if ((DeviceMap.Query.DriveMap & (1 << i))
          && (DeviceMap.Query.DriveType[i] == DOSDEVICE_DRIVE_FIXED))
         {
-            swprintf(DrivePath, L"%c:\\", 'A'+i);
+            swprintf(DrivePath, L"%c:\\", L'A'+i);
             CheckVolume(DrivePath);
         }
     }
-    PrintString("  Done\n\n");
+    //PrintString("  Done\n\n");
     return 0;
 }
 
index 4cab403..20560c1 100644 (file)
@@ -1,8 +1,10 @@
-
+#ifndef RESOURCE_H__
+#define RESOURCE_H__
 
 #define RC_STRING_MAX_SIZE                 4096
 #define IDS_Copy                            100
 #define IDS_FAILS                           101
 
+#endif
 
 /* EOF */
diff --git a/reactos/base/system/rundll32/lang/nl-NL.rc b/reactos/base/system/rundll32/lang/nl-NL.rc
new file mode 100644 (file)
index 0000000..020abeb
--- /dev/null
@@ -0,0 +1,13 @@
+#include "resource.h"
+/*
+ * Moved all hardcoded strings to En.rc.
+ * By Magnus Olsen  2005 magnus@itkonsult-olsen.com