Ros-diffs September 2015

ros-diffs@reactos.org

17 participants
535 discussions

[rnaumann] 69380: [SHELL32]Update some toolbar button bitmaps. By Jared Smudde. CORE-10232
by rnaumann＠svn.reactos.org 27 Sep '15

27 Sep '15

Author: rnaumann Date: Sun Sep 27 17:15:09 2015 New Revision: 69380 URL: http://svn.reactos.org/svn/reactos?rev=69380&view=rev Log: [SHELL32]Update some toolbar button bitmaps. By Jared Smudde. CORE-10232 Modified: trunk/reactos/dll/win32/shell32/res/bitmaps/214.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/215.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/230.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/231.bmp Modified: trunk/reactos/dll/win32/shell32/res/bitmaps/214.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitm… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/bitmaps/215.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitm… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/bitmaps/230.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitm… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/bitmaps/231.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitm… ============================================================================== Binary files - no diff available.

1 0

[rnaumann] 69379: [ICONS]Massive icon improvements by Jared Smudde. CORE-10023
by rnaumann＠svn.reactos.org 27 Sep '15

27 Sep '15

Author: rnaumann Date: Sun Sep 27 16:59:28 2015 New Revision: 69379 URL: http://svn.reactos.org/svn/reactos?rev=69379&view=rev Log: [ICONS]Massive icon improvements by Jared Smudde. CORE-10023 Modified: trunk/reactos/base/applications/control/resources/config.ico trunk/reactos/base/applications/games/solitaire/solitaire.ico trunk/reactos/base/applications/hh/hh.ico trunk/reactos/base/applications/iexplore/iexplore.ico trunk/reactos/base/applications/mplay32/resources/mplay32.ico trunk/reactos/base/applications/msconfig/res/msconfig.ico trunk/reactos/base/applications/msconfig_new/res/msconfig.ico trunk/reactos/base/applications/mstsc/res/colors.ico trunk/reactos/base/applications/mstsc/res/connection.ico trunk/reactos/base/applications/mstsc/res/logon.ico trunk/reactos/base/applications/notepad/res/notepad.ico trunk/reactos/base/applications/rapps/res/cats/audio.ico trunk/reactos/base/applications/rapps/res/cats/engineer.ico trunk/reactos/base/applications/rapps/res/exit.ico trunk/reactos/base/applications/taskmgr/res/taskmgr.ico trunk/reactos/base/shell/cmd/res/terminal.ico trunk/reactos/base/system/msiexec/msiexec.ico trunk/reactos/base/system/runonce/res/icon.ico trunk/reactos/dll/cpl/access/resources/applet.ico trunk/reactos/dll/cpl/appwiz/resources/applet.ico trunk/reactos/dll/cpl/console/res/terminal.ico trunk/reactos/dll/cpl/desk/resources/applet.ico trunk/reactos/dll/cpl/hdwwiz/resources/warning.ico trunk/reactos/dll/cpl/inetcpl/resources/history.ico trunk/reactos/dll/cpl/inetcpl/resources/inetcpl.ico trunk/reactos/dll/cpl/input/resources/keyboard-shortcuts.ico trunk/reactos/dll/cpl/main/resources/admintools_folder.ico trunk/reactos/dll/cpl/main/resources/fonts_folder.ico trunk/reactos/dll/cpl/main/resources/look_key.ico trunk/reactos/dll/cpl/mmsys/resources/3004.ico trunk/reactos/dll/cpl/mmsys/resources/4353.ico trunk/reactos/dll/cpl/mmsys/resources/4354.ico trunk/reactos/dll/cpl/mmsys/resources/4363.ico trunk/reactos/dll/cpl/mmsys/resources/4367.ico trunk/reactos/dll/cpl/mmsys/resources/4368.ico trunk/reactos/dll/cpl/mmsys/resources/4379.ico trunk/reactos/dll/cpl/usrmgr/resources/applet.ico trunk/reactos/dll/shellext/ntobjshex/resources/1.ico trunk/reactos/dll/shellext/ntobjshex/resources/2.ico trunk/reactos/dll/shellext/ntobjshex/resources/7.ico trunk/reactos/dll/win32/comctl32/idi_tt_error_sm.ico trunk/reactos/dll/win32/comctl32/idi_tt_info_sm.ico trunk/reactos/dll/win32/comctl32/idi_tt_warn_sm.ico trunk/reactos/dll/win32/comdlg32/res/icons/cdrom.ico trunk/reactos/dll/win32/comdlg32/res/icons/floppy.ico trunk/reactos/dll/win32/comdlg32/res/icons/folder.ico trunk/reactos/dll/win32/comdlg32/res/icons/folder2.ico trunk/reactos/dll/win32/comdlg32/res/icons/hdisk.ico trunk/reactos/dll/win32/comdlg32/res/icons/network.ico trunk/reactos/dll/win32/msgina/resources/21.ico trunk/reactos/dll/win32/msgina/resources/ico_logoff.ico trunk/reactos/dll/win32/msgina/resources/shutdown.ico trunk/reactos/dll/win32/shell32/res/icons/1.ico trunk/reactos/dll/win32/shell32/res/icons/10.ico trunk/reactos/dll/win32/shell32/res/icons/11.ico trunk/reactos/dll/win32/shell32/res/icons/12.ico trunk/reactos/dll/win32/shell32/res/icons/137.ico trunk/reactos/dll/win32/shell32/res/icons/138.ico trunk/reactos/dll/win32/shell32/res/icons/151.ico trunk/reactos/dll/win32/shell32/res/icons/152.ico trunk/reactos/dll/win32/shell32/res/icons/153.ico trunk/reactos/dll/win32/shell32/res/icons/154.ico trunk/reactos/dll/win32/shell32/res/icons/155.ico trunk/reactos/dll/win32/shell32/res/icons/156.ico trunk/reactos/dll/win32/shell32/res/icons/157.ico trunk/reactos/dll/win32/shell32/res/icons/160.ico trunk/reactos/dll/win32/shell32/res/icons/17.ico trunk/reactos/dll/win32/shell32/res/icons/1700.ico trunk/reactos/dll/win32/shell32/res/icons/173.ico trunk/reactos/dll/win32/shell32/res/icons/191.ico trunk/reactos/dll/win32/shell32/res/icons/192.ico trunk/reactos/dll/win32/shell32/res/icons/2.ico trunk/reactos/dll/win32/shell32/res/icons/20.ico trunk/reactos/dll/win32/shell32/res/icons/210.ico trunk/reactos/dll/win32/shell32/res/icons/22.ico trunk/reactos/dll/win32/shell32/res/icons/220.ico trunk/reactos/dll/win32/shell32/res/icons/221.ico trunk/reactos/dll/win32/shell32/res/icons/224.ico trunk/reactos/dll/win32/shell32/res/icons/225.ico trunk/reactos/dll/win32/shell32/res/icons/236.ico trunk/reactos/dll/win32/shell32/res/icons/237.ico trunk/reactos/dll/win32/shell32/res/icons/238.ico trunk/reactos/dll/win32/shell32/res/icons/245.ico trunk/reactos/dll/win32/shell32/res/icons/248.ico trunk/reactos/dll/win32/shell32/res/icons/250.ico trunk/reactos/dll/win32/shell32/res/icons/269.ico trunk/reactos/dll/win32/shell32/res/icons/279.ico trunk/reactos/dll/win32/shell32/res/icons/299.ico trunk/reactos/dll/win32/shell32/res/icons/3.ico trunk/reactos/dll/win32/shell32/res/icons/308.ico trunk/reactos/dll/win32/shell32/res/icons/309.ico trunk/reactos/dll/win32/shell32/res/icons/315.ico trunk/reactos/dll/win32/shell32/res/icons/317.ico trunk/reactos/dll/win32/shell32/res/icons/319.ico trunk/reactos/dll/win32/shell32/res/icons/32.ico trunk/reactos/dll/win32/shell32/res/icons/33.ico trunk/reactos/dll/win32/shell32/res/icons/330.ico trunk/reactos/dll/win32/shell32/res/icons/35.ico trunk/reactos/dll/win32/shell32/res/icons/36.ico trunk/reactos/dll/win32/shell32/res/icons/37.ico trunk/reactos/dll/win32/shell32/res/icons/38.ico trunk/reactos/dll/win32/shell32/res/icons/39.ico trunk/reactos/dll/win32/shell32/res/icons/4.ico trunk/reactos/dll/win32/shell32/res/icons/44.ico trunk/reactos/dll/win32/shell32/res/icons/45.ico trunk/reactos/dll/win32/shell32/res/icons/48.ico trunk/reactos/dll/win32/shell32/res/icons/5.ico trunk/reactos/dll/win32/shell32/res/icons/54.ico trunk/reactos/dll/win32/shell32/res/icons/8.ico trunk/reactos/dll/win32/shell32/res/icons/8240.ico trunk/reactos/dll/win32/shell32/res/icons/9.ico trunk/reactos/dll/win32/syssetup/resources/5.ico trunk/reactos/dll/win32/themeui/themeui.ico Modified: trunk/reactos/base/applications/control/resources/config.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/games/solitaire/solitaire.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/hh/hh.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/hh/hh.ic… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/iexplore/iexplore.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/mplay32/resources/mplay32.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/msconfig/res/msconfig.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/msconfig_new/res/msconfig.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/mstsc/res/colors.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/mstsc/res/connection.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/mstsc/res/logon.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/notepad/res/notepad.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/rapps/res/cats/audio.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/rapps/res/cats/engineer.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/rapps/res/exit.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/taskmgr/res/taskmgr.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/cmd/res/terminal.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/res/termina… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/system/msiexec/msiexec.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexe… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/system/runonce/res/icon.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/res/ic… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/access/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/resources/a… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/appwiz/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resources/a… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/console/res/terminal.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/res/termin… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/desk/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resources/app… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/hdwwiz/resources/warning.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/resources/w… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/inetcpl/resources/history.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/resources/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/inetcpl/resources/inetcpl.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/resources/… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/input/resources/keyboard-shortcuts.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resources/ke… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/admintools_folder.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/adm… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/fonts_folder.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/fon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/look_key.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/loo… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/mmsys/resources/3004.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/30… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/mmsys/resources/4353.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/mmsys/resources/4354.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/mmsys/resources/4363.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/mmsys/resources/4367.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/mmsys/resources/4368.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/mmsys/resources/4379.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resources/43… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/usrmgr/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/resources/a… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/shellext/ntobjshex/resources/1.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/shellext/ntobjshex/resources/2.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/shellext/ntobjshex/resources/7.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/idi_tt_error_sm.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idi_tt_… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/idi_tt_info_sm.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idi_tt_… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comctl32/idi_tt_warn_sm.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/idi_tt_… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comdlg32/res/icons/cdrom.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comdlg32/res/icons/floppy.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comdlg32/res/icons/folder.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comdlg32/res/icons/folder2.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comdlg32/res/icons/hdisk.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/comdlg32/res/icons/network.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/msgina/resources/21.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/msgina/resources/ico_logoff.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/msgina/resources/shutdown.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/1.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/10.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/11.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/12.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/137.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/138.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/151.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/152.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/153.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/154.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/155.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/156.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/157.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/160.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/17.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/1700.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/173.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/191.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/192.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/2.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/20.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/210.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/22.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/220.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/221.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/224.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/225.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/236.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/237.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/238.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/245.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/248.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/250.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/269.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/279.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/299.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/3.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/308.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/309.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/315.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/317.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/319.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/32.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/33.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/330.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/35.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/36.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/37.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/38.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/39.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/4.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/44.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/45.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/48.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/5.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/54.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/8.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/8240.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shell32/res/icons/9.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/syssetup/resources/5.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/themeui/themeui.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/themeui/themeui.… ============================================================================== Binary files - no diff available.

1 0

[rnaumann] 69378: [NTVDM] Update German translation
by rnaumann＠svn.reactos.org 27 Sep '15

27 Sep '15

Author: rnaumann Date: Sun Sep 27 16:28:27 2015 New Revision: 69378 URL: http://svn.reactos.org/svn/reactos?rev=69378&view=rev Log: [NTVDM] Update German translation Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/de-DE.rc Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/de-DE.rc [iso-8859-1] Sun Sep 27 16:28:27 2015 @@ -9,14 +9,14 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM_TXT , "Dump Memory (&Text)" - IDS_VDM_DUMPMEM_BIN , "Dump Memory (&Binary)" - IDS_VDM_MOUNT_FLOPPY, "Insert a floppy in drive %d <%s>..." - IDS_VDM_EJECT_FLOPPY, "Eject floppy from drive %d" + IDS_VDM_DUMPMEM_TXT , "Speicherabbild erstellen (&Text)" + IDS_VDM_DUMPMEM_BIN , "Speicherabbild erstellen (&BinÃ¤r)" + IDS_VDM_MOUNT_FLOPPY, "Eine Diskette in Laufwerk %d <%s> einlegen..." + IDS_VDM_EJECT_FLOPPY, "Disktette aus Laufwerk %d auswerfen" IDS_VDM_QUIT , "ReactOS VDM b&eenden" END STRINGTABLE BEGIN - IDS_NO_MEDIA, "No media" + IDS_NO_MEDIA, "Kein Medium" END

1 0

[hbelusca] 69377: [KERNEL32]: Use the _ARRAYSIZE macro in the ENV_NAME_ENTRY macro, for the same reasons mentioned in r69376.
by hbelusca＠svn.reactos.org 27 Sep '15

27 Sep '15

Author: hbelusca Date: Sun Sep 27 16:16:26 2015 New Revision: 69377 URL: http://svn.reactos.org/svn/reactos?rev=69377&view=rev Log: [KERNEL32]: Use the _ARRAYSIZE macro in the ENV_NAME_ENTRY macro, for the same reasons mentioned in r69376. Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c Modified: trunk/reactos/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/vdm.c [iso-8859-1] Sun Sep 27 16:16:26 2015 @@ -43,9 +43,8 @@ /* GLOBALS ********************************************************************/ -// NOTE: We cannot use ARRAYSIZE in this macro. GCC would complain otherwise. #define ENV_NAME_ENTRY(type, name) \ - {(type), (sizeof(name)/sizeof(*((ENV_INFO*)0)->Name)) - 1, (name)} + {(type), _ARRAYSIZE(name) - 1, (name)} static ENV_INFO BasepEnvNameType[] = {

1 0

[hbelusca] 69376: [NTVDM]: Fix GCC build by using _ARRAYSIZE (which is the old-school sizeof(foo)/sizeof(foo[0]) macro) instead of ARRAYSIZE (which does the same but in a more complicated way, whic...
by hbelusca＠svn.reactos.org 27 Sep '15

27 Sep '15

Author: hbelusca Date: Sun Sep 27 16:12:45 2015 New Revision: 69376 URL: http://svn.reactos.org/svn/reactos?rev=69376&view=rev Log: [NTVDM]: Fix GCC build by using _ARRAYSIZE (which is the old-school sizeof(foo)/sizeof(foo[0]) macro) instead of ARRAYSIZE (which does the same but in a more complicated way, which involves a construct that cannot be embedded inside definitions of variables). Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] Sun Sep 27 16:12:45 2015 @@ -475,8 +475,8 @@ static DISK_MOUNT_INFO DiskMountInfo[MAX_DISK_TYPE] = { - {XDCFloppyDrive, ARRAYSIZE(XDCFloppyDrive), MountFDI}, - {XDCHardDrive , ARRAYSIZE(XDCHardDrive) , MountHDD}, + {XDCFloppyDrive, _ARRAYSIZE(XDCFloppyDrive), MountFDI}, + {XDCHardDrive , _ARRAYSIZE(XDCHardDrive) , MountHDD}, }; PDISK_IMAGE

1 0

[hbelusca] 69375: [NTVDM] - Start implementing a user menu for mounting/unmounting floppy disks at runtime. Menu state refresh & proper localization remain to be done. - Add a temporary "Sleep(INFI...
by hbelusca＠svn.reactos.org 27 Sep '15

27 Sep '15

Author: hbelusca Date: Sun Sep 27 15:24:26 2015 New Revision: 69375 URL: http://svn.reactos.org/svn/reactos?rev=69375&view=rev Log: [NTVDM] - Start implementing a user menu for mounting/unmounting floppy disks at runtime. Menu state refresh & proper localization remain to be done. - Add a temporary "Sleep(INFINITE)" where the VdmShutdown function is susceptible to trigger again a VDM cleanup in case it was called again in parallel. For diagnosing CORE-10182, see also r69366. Modified: trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c trunk/reactos/subsystems/mvdm/ntvdm/emulator.c trunk/reactos/subsystems/mvdm/ntvdm/emulator.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.h trunk/reactos/subsystems/mvdm/ntvdm/lang/cs-CZ.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/de-DE.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/en-US.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/es-ES.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/fr-FR.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/it-IT.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/pl-PL.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/ro-RO.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/ru-RU.rc trunk/reactos/subsystems/mvdm/ntvdm/lang/tr-TR.rc trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h trunk/reactos/subsystems/mvdm/ntvdm/resource.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/CMak… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt [iso-8859-1] Sun Sep 27 15:24:26 2015 @@ -73,5 +73,5 @@ add_executable(ntvdm ${SOURCE}) set_module_type(ntvdm win32cui UNICODE IMAGEBASE 0x0F000000) target_link_libraries(ntvdm fast486 ${PSEH_LIB}) -add_importlibs(ntvdm user32 gdi32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(ntvdm user32 gdi32 advapi32 comdlg32 msvcrt kernel32 ntdll) add_cd_file(TARGET ntvdm DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c [iso-8859-1] Sun Sep 27 15:24:26 2015 @@ -686,9 +686,9 @@ /* Detect and initialize the supported disks */ // TODO: the "Detect" part is missing. - FloppyDrive[0] = &XDCFloppyDrive[0]; - FloppyDrive[1] = &XDCFloppyDrive[1]; - HardDrive[0] = &XDCHardDrive[0]; + FloppyDrive[0] = RetrieveDisk(FLOPPY_DISK, 0); + FloppyDrive[1] = RetrieveDisk(FLOPPY_DISK, 1); + HardDrive[0] = RetrieveDisk(HARD_DISK, 0); return TRUE; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] Sun Sep 27 15:24:26 2015 @@ -405,6 +405,51 @@ DPRINT1("Memory dump done\n"); } +VOID MountFloppy(IN ULONG DiskNumber) +{ +// FIXME: This should be present in PSDK commdlg.h +// +// FlagsEx Values +#if (_WIN32_WINNT >= 0x0500) +#define OFN_EX_NOPLACESBAR 0x00000001 +#endif // (_WIN32_WINNT >= 0x0500) + + OPENFILENAMEA ofn; + CHAR szFile[MAX_PATH] = ""; + + RtlZeroMemory(&ofn, sizeof(ofn)); + ofn.lStructSize = sizeof(ofn); + ofn.hwndOwner = hConsoleWnd; + ofn.lpstrTitle = "Select a virtual floppy image"; + ofn.Flags = OFN_EXPLORER | OFN_ENABLESIZING | OFN_LONGNAMES | OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; +// ofn.FlagsEx = OFN_EX_NOPLACESBAR; + ofn.lpstrFilter = "Virtual floppy images (*.vfd;*.img;*.ima;*.dsk)\0*.vfd\0All files (*.*)\0*.*\0"; + ofn.lpstrDefExt = "vfd"; + ofn.nFilterIndex = 0; + ofn.lpstrFile = szFile; + ofn.nMaxFile = ARRAYSIZE(szFile); + + if (!GetOpenFileNameA(&ofn)) + { + DPRINT1("CommDlgExtendedError = %d\n", CommDlgExtendedError()); + return; + } + + // TODO: Refresh the menu state + + if (!MountDisk(FLOPPY_DISK, DiskNumber, szFile, !!(ofn.Flags & OFN_READONLY))) + DisplayMessage(L"An error happened when mounting disk %d", DiskNumber); +} + +VOID EjectFloppy(IN ULONG DiskNumber) +{ + // TODO: Refresh the menu state + + if (!UnmountDisk(FLOPPY_DISK, DiskNumber)) + DisplayMessage(L"An error happened when ejecting disk %d", DiskNumber); +} + + VOID EmulatorPause(VOID) { /* Pause the VDM */ @@ -506,6 +551,18 @@ return FALSE; } +#if 0 + // The following commands are examples of MountDisk usage. + // NOTE: Those values are hardcoded paths on my local test machines!! + + // MountDisk(FLOPPY_DISK, 0, "H:\\trunk\\ntvdm_studies\\diskette_high.vfd", TRUE); + // MountDisk(FLOPPY_DISK, 0, "H:\\DOS_tests\\Dos5.0.img", TRUE); + // MountDisk(FLOPPY_DISK, 0, "H:\\trunk\\ntvdm_studies\\hdd_10Mo_fixed.vhd", TRUE); + // MountDisk(FLOPPY_DISK, 0, "H:\\DOS_tests\\diskette_test.vfd", FALSE); + + MountDisk(HARD_DISK, 0, "H:\\DOS_tests\\MS-DOS 6_fixed_size.vhd", FALSE); +#endif + /* Initialize the software callback system and register the emulator BOPs */ InitializeInt32(); RegisterBop(BOP_DEBUGGER , EmulatorDebugBreakBop); Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.h [iso-8859-1] Sun Sep 27 15:24:26 2015 @@ -98,6 +98,9 @@ VOID DumpMemory(BOOLEAN TextFormat); +VOID MountFloppy(IN ULONG DiskNumber); +VOID EjectFloppy(IN ULONG DiskNumber); + UCHAR FASTCALL EmulatorIntAcknowledge ( PFAST486_STATE State Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] Sun Sep 27 15:24:26 2015 @@ -156,8 +156,7 @@ /*************************** FLOPPY DISK CONTROLLER ***************************/ // A Floppy Controller can support up to 4 floppy drives. -/*static*/ -DISK_IMAGE XDCFloppyDrive[4]; +static DISK_IMAGE XDCFloppyDrive[4]; // Taken from DOSBox typedef struct _DISK_GEO @@ -239,8 +238,7 @@ // An IDE Hard Disk Controller can support up to 4 drives: // Primary Master Drive, Primary Slave Drive, // Secondary Master Drive, Secondary Slave Drive. -/*static*/ -DISK_IMAGE XDCHardDrive[4]; +static DISK_IMAGE XDCHardDrive[4]; BOOLEAN MountHDD(IN PDISK_IMAGE DiskImage, @@ -468,21 +466,59 @@ typedef BOOLEAN (*MOUNT_DISK_HANDLER)(IN PDISK_IMAGE DiskImage, IN HANDLE hFile); +typedef struct _DISK_MOUNT_INFO +{ + PDISK_IMAGE DiskArray; + ULONG NumDisks; + MOUNT_DISK_HANDLER MountDiskHelper; +} DISK_MOUNT_INFO, *PDISK_MOUNT_INFO; + +static DISK_MOUNT_INFO DiskMountInfo[MAX_DISK_TYPE] = +{ + {XDCFloppyDrive, ARRAYSIZE(XDCFloppyDrive), MountFDI}, + {XDCHardDrive , ARRAYSIZE(XDCHardDrive) , MountHDD}, +}; + +PDISK_IMAGE +RetrieveDisk(IN DISK_TYPE DiskType, + IN ULONG DiskNumber) +{ + ASSERT(DiskType < MAX_DISK_TYPE); + + if (DiskNumber >= DiskMountInfo[DiskType].NumDisks) + { + DisplayMessage(L"RetrieveDisk: Disk number %d:%d invalid.", DiskType, DiskNumber); + return NULL; + } + + return &DiskMountInfo[DiskType].DiskArray[DiskNumber]; +} + BOOLEAN -MountDisk(IN PDISK_IMAGE DiskImage, - MOUNT_DISK_HANDLER MountDiskHelper, +MountDisk(IN DISK_TYPE DiskType, + IN ULONG DiskNumber, IN PCSTR FileName, IN BOOLEAN ReadOnly) { BOOLEAN Success = FALSE; + PDISK_IMAGE DiskImage; HANDLE hFile; BY_HANDLE_FILE_INFORMATION FileInformation; + ASSERT(DiskType < MAX_DISK_TYPE); + + if (DiskNumber >= DiskMountInfo[DiskType].NumDisks) + { + DisplayMessage(L"MountDisk: Disk number %d:%d invalid.", DiskType, DiskNumber); + return FALSE; + } + + DiskImage = &DiskMountInfo[DiskType].DiskArray[DiskNumber]; if (IsDiskPresent(DiskImage)) { - DisplayMessage(L"MountDisk: Disk 0x%p already in use.", DiskImage); - return FALSE; + DPRINT1("MountDisk: Disk %d:%d:0x%p already in use, recycling...\n", DiskType, DiskNumber, DiskImage); + UnmountDisk(DiskType, DiskNumber); } /* Try to open the file */ @@ -540,7 +576,7 @@ } /* Success, mount the image */ - if (!MountDiskHelper(DiskImage, hFile)) + if (!DiskMountInfo[DiskType].MountDiskHelper(DiskImage, hFile)) { DisplayMessage(L"MountDisk: Failed to mount disk file '%S' in 0x%p.", FileName, DiskImage); goto Quit; @@ -553,11 +589,23 @@ } BOOLEAN -UnmountDisk(IN PDISK_IMAGE DiskImage) -{ +UnmountDisk(IN DISK_TYPE DiskType, + IN ULONG DiskNumber) +{ + PDISK_IMAGE DiskImage; + + ASSERT(DiskType < MAX_DISK_TYPE); + + if (DiskNumber >= DiskMountInfo[DiskType].NumDisks) + { + DisplayMessage(L"UnmountDisk: Disk number %d:%d invalid.", DiskType, DiskNumber); + return FALSE; + } + + DiskImage = &DiskMountInfo[DiskType].DiskArray[DiskNumber]; if (!IsDiskPresent(DiskImage)) { - DisplayMessage(L"UnmountDisk: Disk 0x%p is already unmounted.", DiskImage); + DPRINT1("UnmountDisk: Disk %d:%d:0x%p is already unmounted\n", DiskType, DiskNumber, DiskImage); return FALSE; } @@ -573,28 +621,20 @@ BOOLEAN DiskCtrlInitialize(VOID) { -#if 0 - // The following commands are examples of MountDisk usage. - // NOTE: Those values are hardcoded paths on my local test machines!! - - // MountDisk(&XDCFloppyDrive[0], MountFDI, "H:\\trunk\\ntvdm_studies\\diskette_high.vfd", TRUE); - // MountDisk(&XDCFloppyDrive[0], MountFDI, "H:\\DOS_tests\\Dos5.0.img", TRUE); - // MountDisk(&XDCHardDrive[0] , MountHDD, "H:\\trunk\\ntvdm_studies\\hdd_10Mo_fixed.vhd", TRUE); - - MountDisk(&XDCFloppyDrive[0], MountFDI, "H:\\DOS_tests\\diskette_test.vfd", FALSE); - MountDisk(&XDCHardDrive[0] , MountHDD, "H:\\DOS_tests\\MS-DOS 6_fixed_size.vhd", FALSE); -#endif - return TRUE; } VOID DiskCtrlCleanup(VOID) { -#if 0 - // The following commands are examples of UnmountDisk usage. - UnmountDisk(&XDCHardDrive[0]); - UnmountDisk(&XDCFloppyDrive[0]); -#endif + ULONG DiskNumber; + + /* Unmount all the floppy disk drives */ + for (DiskNumber = 0; DiskNumber < DiskMountInfo[FLOPPY_DISK].NumDisks; ++DiskNumber) + UnmountDisk(FLOPPY_DISK, DiskNumber); + + /* Unmount all the hard disk drives */ + for (DiskNumber = 0; DiskNumber < DiskMountInfo[HARD_DISK].NumDisks; ++DiskNumber) + UnmountDisk(HARD_DISK, DiskNumber); } /* EOF */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.h [iso-8859-1] Sun Sep 27 15:24:26 2015 @@ -39,9 +39,12 @@ } DISK_IMAGE, *PDISK_IMAGE; -// HACKHACK! For dskbios32.c -extern DISK_IMAGE XDCFloppyDrive[]; -extern DISK_IMAGE XDCHardDrive[]; +typedef enum _DISK_TYPE +{ + FLOPPY_DISK, + HARD_DISK, + MAX_DISK_TYPE +} DISK_TYPE; /* FUNCTIONS ******************************************************************/ @@ -68,6 +71,20 @@ IN BYTE Sector, IN BYTE NumSectors); +PDISK_IMAGE +RetrieveDisk(IN DISK_TYPE DiskType, + IN ULONG DiskNumber); + +BOOLEAN +MountDisk(IN DISK_TYPE DiskType, + IN ULONG DiskNumber, + IN PCSTR FileName, + IN BOOLEAN ReadOnly); + +BOOLEAN +UnmountDisk(IN DISK_TYPE DiskType, + IN ULONG DiskNumber); + BOOLEAN DiskCtrlInitialize(VOID); VOID DiskCtrlCleanup(VOID); Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/cs-CZ.rc [iso-8859-1] Sun Sep 27 15:24:26 2015 @@ -15,7 +15,14 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" - IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" - IDS_VDM_QUIT , "&UkonÄit ReactOS VDM" + IDS_VDM_DUMPMEM_TXT , "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN , "Dump Memory (&Binary)" + IDS_VDM_MOUNT_FLOPPY, "Insert a floppy in drive %d <%s>..." + IDS_VDM_EJECT_FLOPPY, "Eject floppy from drive %d" + IDS_VDM_QUIT , "&UkonÄit ReactOS VDM" END + +STRINGTABLE +BEGIN + IDS_NO_MEDIA, "No media" +END Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/de-DE.rc [iso-8859-1] Sun Sep 27 15:24:26 2015 @@ -9,7 +9,14 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" - IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" - IDS_VDM_QUIT , "ReactOS VDM b&eenden" + IDS_VDM_DUMPMEM_TXT , "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN , "Dump Memory (&Binary)" + IDS_VDM_MOUNT_FLOPPY, "Insert a floppy in drive %d <%s>..." + IDS_VDM_EJECT_FLOPPY, "Eject floppy from drive %d" + IDS_VDM_QUIT , "ReactOS VDM b&eenden" END + +STRINGTABLE +BEGIN + IDS_NO_MEDIA, "No media" +END Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/en-US.rc [iso-8859-1] Sun Sep 27 15:24:26 2015 @@ -9,7 +9,14 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" - IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" - IDS_VDM_QUIT , "&Quit the ReactOS VDM" + IDS_VDM_DUMPMEM_TXT , "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN , "Dump Memory (&Binary)" + IDS_VDM_MOUNT_FLOPPY, "Insert a floppy in drive %d <%s>..." + IDS_VDM_EJECT_FLOPPY, "Eject floppy from drive %d" + IDS_VDM_QUIT , "&Quit the ReactOS VDM" END + +STRINGTABLE +BEGIN + IDS_NO_MEDIA, "No media" +END Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/es-ES.rc [iso-8859-1] Sun Sep 27 15:24:26 2015 @@ -9,7 +9,14 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" - IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" - IDS_VDM_QUIT , "&Salir de ReactOS VDM" + IDS_VDM_DUMPMEM_TXT , "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN , "Dump Memory (&Binary)" + IDS_VDM_MOUNT_FLOPPY, "Insert a floppy in drive %d <%s>..." + IDS_VDM_EJECT_FLOPPY, "Eject floppy from drive %d" + IDS_VDM_QUIT , "&Salir de ReactOS VDM" END + +STRINGTABLE +BEGIN + IDS_NO_MEDIA, "No media" +END Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/fr-FR.rc [iso-8859-1] Sun Sep 27 15:24:26 2015 @@ -9,7 +9,14 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM_TXT, "Vidage MÃ©moire (&Texte)" - IDS_VDM_DUMPMEM_BIN, "Vidage MÃ©moire (&Binaire)" - IDS_VDM_QUIT , "&Quitter la ReactOS VDM" + IDS_VDM_DUMPMEM_TXT , "Vidage MÃ©moire (&Texte)" + IDS_VDM_DUMPMEM_BIN , "Vidage MÃ©moire (&Binaire)" + IDS_VDM_MOUNT_FLOPPY, "InsÃ©rer une disquette dans le lecteur %d <%s>..." + IDS_VDM_EJECT_FLOPPY, "Ãjecter la disquette du lecteur %d" + IDS_VDM_QUIT , "&Quitter la ReactOS VDM" END + +STRINGTABLE +BEGIN + IDS_NO_MEDIA, "No media" +END Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/it-IT.rc [iso-8859-1] Sun Sep 27 15:24:26 2015 @@ -9,7 +9,14 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM_TXT, "Dump Memory (&Text)" - IDS_VDM_DUMPMEM_BIN, "Dump Memory (&Binary)" - IDS_VDM_QUIT , "&Esci da ReactOS VDM" + IDS_VDM_DUMPMEM_TXT , "Dump Memory (&Text)" + IDS_VDM_DUMPMEM_BIN , "Dump Memory (&Binary)" + IDS_VDM_MOUNT_FLOPPY, "Insert a floppy in drive %d <%s>..." + IDS_VDM_EJECT_FLOPPY, "Eject floppy from drive %d" + IDS_VDM_QUIT , "&Esci da ReactOS VDM" END + +STRINGTABLE +BEGIN + IDS_NO_MEDIA, "No media" +END Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/pl-PL.rc [iso-8859-1] Sun Sep 27 15:24:26 2015 @@ -11,7 +11,14 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM_TXT, "Zrzut pamiÄci (&Tekst)" - IDS_VDM_DUMPMEM_BIN, "Zrzut pamiÄci (&Binarny)" - IDS_VDM_QUIT , "&WyjdÅº z ReactOS VDM" + IDS_VDM_DUMPMEM_TXT , "Zrzut pamiÄci (&Tekst)" + IDS_VDM_DUMPMEM_BIN , "Zrzut pamiÄci (&Binarny)" + IDS_VDM_MOUNT_FLOPPY, "Insert a floppy in drive %d <%s>..." + IDS_VDM_EJECT_FLOPPY, "Eject floppy from drive %d" + IDS_VDM_QUIT , "&WyjdÅº z ReactOS VDM" END + +STRINGTABLE +BEGIN + IDS_NO_MEDIA, "No media" +END Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/ro-RO.rc [iso-8859-1] Sun Sep 27 15:24:26 2015 @@ -9,7 +9,14 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM_TXT, "CapturÄ memorie (te&xt)" - IDS_VDM_DUMPMEM_BIN, "CapturÄ memorie (&binarÄ)" - IDS_VDM_QUIT , "I&eÈire din ReactOS VDM" + IDS_VDM_DUMPMEM_TXT , "CapturÄ memorie (te&xt)" + IDS_VDM_DUMPMEM_BIN , "CapturÄ memorie (&binarÄ)" + IDS_VDM_MOUNT_FLOPPY, "Insert a floppy in drive %d <%s>..." + IDS_VDM_EJECT_FLOPPY, "Eject floppy from drive %d" + IDS_VDM_QUIT , "I&eÈire din ReactOS VDM" END + +STRINGTABLE +BEGIN + IDS_NO_MEDIA, "No media" +END Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/ru-RU.rc [iso-8859-1] Sun Sep 27 15:24:26 2015 @@ -9,7 +9,14 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM_TXT, "ÐÐ°Ð¼Ð¿ Ð¿Ð°Ð¼ÑÑÐ¸ (&Ð¢ÐµÐºÑÑÐ¾Ð²ÑÐ¹)" - IDS_VDM_DUMPMEM_BIN, "ÐÐ°Ð¼Ð¿ Ð¿Ð°Ð¼ÑÑÐ¸ (&ÐÐ¸Ð½Ð°ÑÐ½ÑÐ¹)" - IDS_VDM_QUIT , "&ÐÑÐ¹ÑÐ¸ Ð¸Ð· ReactOS VDM" + IDS_VDM_DUMPMEM_TXT , "ÐÐ°Ð¼Ð¿ Ð¿Ð°Ð¼ÑÑÐ¸ (&Ð¢ÐµÐºÑÑÐ¾Ð²ÑÐ¹)" + IDS_VDM_DUMPMEM_BIN , "ÐÐ°Ð¼Ð¿ Ð¿Ð°Ð¼ÑÑÐ¸ (&ÐÐ¸Ð½Ð°ÑÐ½ÑÐ¹)" + IDS_VDM_MOUNT_FLOPPY, "Insert a floppy in drive %d <%s>..." + IDS_VDM_EJECT_FLOPPY, "Eject floppy from drive %d" + IDS_VDM_QUIT , "&ÐÑÐ¹ÑÐ¸ Ð¸Ð· ReactOS VDM" END + +STRINGTABLE +BEGIN + IDS_NO_MEDIA, "No media" +END Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/tr-TR.rc [iso-8859-1] Sun Sep 27 15:24:26 2015 @@ -11,7 +11,14 @@ STRINGTABLE BEGIN - IDS_VDM_DUMPMEM_TXT, "&Bellek DÃ¶kÃ¼mÃ¼nÃ¼ Al (Metin)" - IDS_VDM_DUMPMEM_BIN, "B&ellek DÃ¶kÃ¼mÃ¼nÃ¼ Al (Ä°kili)" - IDS_VDM_QUIT , "&ReactOS VDM'den ÃÄ±k" + IDS_VDM_DUMPMEM_TXT , "&Bellek DÃ¶kÃ¼mÃ¼nÃ¼ Al (Metin)" + IDS_VDM_DUMPMEM_BIN , "B&ellek DÃ¶kÃ¼mÃ¼nÃ¼ Al (Ä°kili)" + IDS_VDM_MOUNT_FLOPPY, "Insert a floppy in drive %d <%s>..." + IDS_VDM_EJECT_FLOPPY, "Eject floppy from drive %d" + IDS_VDM_QUIT , "&ReactOS VDM'den ÃÄ±k" END + +STRINGTABLE +BEGIN + IDS_NO_MEDIA, "No media" +END Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] Sun Sep 27 15:24:26 2015 @@ -30,7 +30,7 @@ INT NtVdmArgc; WCHAR** NtVdmArgv; - +HWND hConsoleWnd = NULL; static HMENU hConsoleMenu = NULL; static INT VdmMenuPos = -1; static BOOLEAN ShowPointer = FALSE; @@ -42,13 +42,17 @@ { UINT uID; const struct _VDM_MENUITEM *SubMenu; - WORD wCmdID; + UINT_PTR uCmdID; } VDM_MENUITEM, *PVDM_MENUITEM; static const VDM_MENUITEM VdmMenuItems[] = { { IDS_VDM_DUMPMEM_TXT, NULL, ID_VDM_DUMPMEM_TXT }, { IDS_VDM_DUMPMEM_BIN, NULL, ID_VDM_DUMPMEM_BIN }, + { -1, NULL, 0 }, /* Separator */ + // { IDS_VDM_MOUNT_FLOPPY, NULL, ID_VDM_DRIVES }, + // { IDS_VDM_EJECT_FLOPPY, NULL, ID_VDM_DRIVES }, + { -1, NULL, 0 }, /* Separator */ { IDS_VDM_QUIT , NULL, ID_VDM_QUIT }, { 0, NULL, 0 } /* End of list */ @@ -57,7 +61,7 @@ static const VDM_MENUITEM VdmMainMenuItems[] = { { -1, NULL, 0 }, /* Separator */ - { IDS_HIDE_MOUSE, NULL, ID_SHOWHIDE_MOUSE }, /* Hide mouse; can be renamed to Show mouse */ + { IDS_HIDE_MOUSE, NULL, ID_SHOWHIDE_MOUSE }, /* "Hide mouse"; can be renamed to "Show mouse" */ { IDS_VDM_MENU , VdmMenuItems, 0 }, /* ReactOS VDM Menu */ { 0, NULL, 0 } /* End of list */ @@ -68,7 +72,7 @@ const VDM_MENUITEM *Items) { UINT i = 0; - WCHAR szMenuString[255]; + WCHAR szMenuString[256]; HMENU hSubMenu; do @@ -100,7 +104,7 @@ { AppendMenuW(hMenu, MF_STRING, - Items[i].wCmdID, + Items[i].uCmdID, szMenuString); } } @@ -113,7 +117,7 @@ NULL); } i++; - } while (!(Items[i].uID == 0 && Items[i].SubMenu == NULL && Items[i].wCmdID == 0)); + } while (!(Items[i].uID == 0 && Items[i].SubMenu == NULL && Items[i].uCmdID == 0)); } BOOL @@ -138,9 +142,15 @@ /*static*/ VOID CreateVdmMenu(HANDLE ConOutHandle) { + HMENU hVdmSubMenu; + UINT_PTR ItemID = ID_VDM_DRIVES; + UINT Pos; + WCHAR szNoMedia[100]; + WCHAR szMenuString1[256], szMenuString2[256]; + hConsoleMenu = ConsoleMenuControl(ConOutHandle, ID_SHOWHIDE_MOUSE, - ID_VDM_QUIT); + ID_VDM_DRIVES + 4); if (hConsoleMenu == NULL) return; /* Get the position where we are going to insert our menu items */ @@ -149,8 +159,52 @@ /* Really add the menu if it doesn't already exist (in case eg. NTVDM crashed) */ if (!VdmMenuExists(hConsoleMenu)) { + /* Add all the menu entries */ AppendMenuItems(hConsoleMenu, VdmMainMenuItems); - DrawMenuBar(GetConsoleWindow()); + + /* Add the removable drives menu entries */ + hVdmSubMenu = GetSubMenu(hConsoleMenu, VdmMenuPos + 2); // VdmMenuItems + Pos = 3; // After the 2 items and the separator in VdmMenuItems + + LoadStringW(GetModuleHandle(NULL), + IDS_NO_MEDIA, + szNoMedia, + ARRAYSIZE(szNoMedia)); + + LoadStringW(GetModuleHandle(NULL), + IDS_VDM_MOUNT_FLOPPY, + szMenuString1, + ARRAYSIZE(szMenuString1)); + + /* Drive 0 -- Mount */ + _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, 0, szNoMedia); + szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; + InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 0, szMenuString2); + + /* Drive 1 -- Mount */ + _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, 1, szNoMedia); + szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; + InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 2, szMenuString2); + + LoadStringW(GetModuleHandle(NULL), + IDS_VDM_EJECT_FLOPPY, + szMenuString1, + ARRAYSIZE(szMenuString1)); + + /* Drive 0 -- Eject */ + _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, 0); + szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; + InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 1, szMenuString2); + + /* Drive 1 -- Eject */ + _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, 1); + szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; + InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 3, szMenuString2); + + // TODO: Refresh the menu state + + /* Refresh the menu */ + DrawMenuBar(hConsoleWnd); } } @@ -164,14 +218,14 @@ { DeleteMenu(hConsoleMenu, VdmMenuPos, MF_BYPOSITION); i++; - } while (!(Items[i].uID == 0 && Items[i].SubMenu == NULL && Items[i].wCmdID == 0)); - - DrawMenuBar(GetConsoleWindow()); + } while (!(Items[i].uID == 0 && Items[i].SubMenu == NULL && Items[i].uCmdID == 0)); + + DrawMenuBar(hConsoleWnd); } static VOID ShowHideMousePointer(HANDLE ConOutHandle, BOOLEAN ShowPtr) { - WCHAR szMenuString[255] = L""; + WCHAR szMenuString[256]; if (ShowPtr) { @@ -267,7 +321,7 @@ /* Display the message */ DPRINT1("\n\nNTVDM Subsystem\n%S\n\n", Buffer); - MessageBoxW(NULL, Buffer, L"NTVDM Subsystem", MB_OK); + MessageBoxW(hConsoleWnd, Buffer, L"NTVDM Subsystem", MB_OK); #ifndef WIN2K_COMPLIANT /* Free the buffer if needed */ @@ -291,6 +345,7 @@ if (MustShutdown) { DPRINT1("Shutdown is ongoing...\n"); + Sleep(INFINITE); return; } @@ -343,6 +398,7 @@ static VOID ConsoleInitUI(VOID) { + hConsoleWnd = GetConsoleWindow(); CreateVdmMenu(ConsoleOutput); } @@ -468,6 +524,26 @@ case ID_VDM_DUMPMEM_BIN: DumpMemory(FALSE); break; + + /* Drive 0 -- Mount */ + /* Drive 1 -- Mount */ + case ID_VDM_DRIVES + 0: + case ID_VDM_DRIVES + 2: + { + ULONG DiskNumber = (MenuEvent->dwCommandId - ID_VDM_DRIVES) / 2; + MountFloppy(DiskNumber); + break; + } + + /* Drive 0 -- Eject */ + /* Drive 1 -- Eject */ + case ID_VDM_DRIVES + 1: + case ID_VDM_DRIVES + 3: + { + ULONG DiskNumber = (MenuEvent->dwCommandId - ID_VDM_DRIVES - 1) / 2; + EjectFloppy(DiskNumber); + break; + } case ID_VDM_QUIT: /* Stop the VDM */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] Sun Sep 27 15:24:26 2015 @@ -24,6 +24,8 @@ #include <winnls.h> #include <winreg.h> #include <winuser.h> +#include <commdlg.h> + #include <subsys/win/vdm.h> // Do not include stuff that is only defined @@ -73,6 +75,8 @@ extern INT NtVdmArgc; extern WCHAR** NtVdmArgv; +extern HWND hConsoleWnd; + /* * Interface functions Modified: trunk/reactos/subsystems/mvdm/ntvdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/reso… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/resource.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/resource.h [iso-8859-1] Sun Sep 27 15:24:26 2015 @@ -6,14 +6,21 @@ #define ID_VDM_DUMPMEM_BIN 1002 #define ID_VDM_QUIT 1003 +/* Menu IDs for removable media */ +#define ID_VDM_DRIVES 1010 + /* String IDs */ #define IDS_HIDE_MOUSE 100 #define IDS_SHOW_MOUSE 101 #define IDS_VDM_MENU 102 -#define IDS_VDM_DUMPMEM_TXT 200 -#define IDS_VDM_DUMPMEM_BIN 201 -#define IDS_VDM_QUIT 202 +#define IDS_VDM_DUMPMEM_TXT 200 +#define IDS_VDM_DUMPMEM_BIN 201 +#define IDS_VDM_MOUNT_FLOPPY 202 +#define IDS_VDM_EJECT_FLOPPY 203 +#define IDS_VDM_QUIT 204 + +#define IDS_NO_MEDIA 300 /* Icon */ #define IDI_APPICON 1

1 0

[gadamopoulos] 69374: [SHELL32] - Fix for drive free/total space in My Computer. Patch by Barrett Karish. CORE-10264
by gadamopoulos＠svn.reactos.org 27 Sep '15

27 Sep '15

Author: gadamopoulos Date: Sun Sep 27 15:09:28 2015 New Revision: 69374 URL: http://svn.reactos.org/svn/reactos?rev=69374&view=rev Log: [SHELL32] - Fix for drive free/total space in My Computer. Patch by Barrett Karish. CORE-10264 Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Sun Sep 27 15:09:28 2015 @@ -669,21 +669,26 @@ switch (iColumn) { case 0: /* name */ - hr = GetDisplayNameOf(pidl, - SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); + hr = GetDisplayNameOf(pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); break; case 1: /* type */ _ILGetFileType(pidl, psd->str.cStr, MAX_PATH); break; case 2: /* total size */ _ILSimpleGetText (pidl, szPath, MAX_PATH); - GetDiskFreeSpaceExA (szPath, NULL, &ulBytes, NULL); - StrFormatByteSize64A (ulBytes.QuadPart, psd->str.cStr, MAX_PATH); + if (GetVolumeInformationA(szPath, NULL, 0, NULL, NULL, NULL, NULL, 0)) + { + GetDiskFreeSpaceExA(szPath, NULL, &ulBytes, NULL); + StrFormatByteSize64A(ulBytes.QuadPart, psd->str.cStr, MAX_PATH); + } break; case 3: /* free size */ _ILSimpleGetText (pidl, szPath, MAX_PATH); - GetDiskFreeSpaceExA (szPath, &ulBytes, NULL, NULL); - StrFormatByteSize64A (ulBytes.QuadPart, psd->str.cStr, MAX_PATH); + if (GetVolumeInformationA(szPath, NULL, 0, NULL, NULL, NULL, NULL, 0)) + { + GetDiskFreeSpaceExA(szPath, &ulBytes, NULL, NULL); + StrFormatByteSize64A(ulBytes.QuadPart, psd->str.cStr, MAX_PATH); + } break; } hr = S_OK;

1 0

[gadamopoulos] 69373: [SHELL32] - Don't duplicate the code for getting the name of a drive. CDrivesFolder already does it (and it does it better). Make the drive properties call it to get the name ...
by gadamopoulos＠svn.reactos.org 27 Sep '15

27 Sep '15

Author: gadamopoulos Date: Sun Sep 27 14:27:09 2015 New Revision: 69373 URL: http://svn.reactos.org/svn/reactos?rev=69373&view=rev Log: [SHELL32] - Don't duplicate the code for getting the name of a drive. CDrivesFolder already does it (and it does it better). Make the drive properties call it to get the name it needs. CORE-10258 Modified: trunk/reactos/dll/win32/shell32/dialogs/drive.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/drive.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/drive.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/drive.cpp [iso-8859-1] Sun Sep 27 14:27:09 2015 @@ -124,7 +124,8 @@ HPROPSHEETPAGE hpsp[MAX_PROPERTY_SHEET_PAGE]; PROPSHEETHEADERW psh; CComObject<CDrvDefExt> *pDrvDefExt = NULL; - + WCHAR wszName[256]; + ZeroMemory(&psh, sizeof(PROPSHEETHEADERW)); psh.dwSize = sizeof(PROPSHEETHEADERW); psh.dwFlags = 0; // FIXME: make it modeless @@ -132,33 +133,17 @@ psh.nStartPage = 0; psh.phpage = hpsp; - WCHAR wszName[256]; - if (GetVolumeInformationW(pwszDrive, wszName, _countof(wszName), NULL, NULL, NULL, NULL, 0)) + LPITEMIDLIST completePidl = ILCombine(pidlFolder, apidl[0]); + if (!completePidl) + return FALSE; + + if (ILGetDisplayNameExW(NULL, completePidl, wszName, ILGDN_NORMAL)) { psh.pszCaption = wszName; psh.dwFlags |= PSH_PROPTITLE; - pwszDrive[2] = 0; - if (wszName[0] == UNICODE_NULL) - { - UINT len; - switch (GetDriveTypeW(pwszDrive)) - { - case DRIVE_CDROM: - len = LoadStringW(shell32_hInstance, IDS_DRIVE_CDROM, wszName, _countof(wszName)); - break; - case DRIVE_REMOTE: - len = LoadStringW(shell32_hInstance, IDS_DRIVE_NETWORK, wszName, _countof(wszName)); - break; - case DRIVE_FIXED: - default: - len = LoadStringW(shell32_hInstance, IDS_DRIVE_FIXED, wszName, _countof(wszName)); - break; - } - StringCchPrintf(wszName + len, _countof(wszName) - len, L" (%s)", pwszDrive); - } - else - StringCchPrintf(wszName + wcslen(wszName), _countof(wszName) - wcslen(wszName), L" (%s)", pwszDrive); - } + } + + ILFree(completePidl); CComPtr<IDataObject> pDataObj; HRESULT hr = SHCreateDataObject(pidlFolder, 1, apidl, NULL, IID_PPV_ARG(IDataObject, &pDataObj));

1 0

[akhaldi] 69372: [DIRECTX] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114
by akhaldi＠svn.reactos.org 27 Sep '15

27 Sep '15

Author: akhaldi Date: Sun Sep 27 14:00:29 2015 New Revision: 69372 URL: http://svn.reactos.org/svn/reactos?rev=69372&view=rev Log: [DIRECTX] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114 Modified: trunk/reactos/dll/directx/bdaplgin/bdaplgin.cpp trunk/reactos/dll/directx/bdaplgin/devicecontrol.cpp trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp trunk/reactos/dll/directx/bdaplgin/signalstatistics.cpp trunk/reactos/dll/directx/d3d9/d3d9_cursor.c trunk/reactos/dll/directx/d3d9/d3d9_puredevice.h trunk/reactos/dll/directx/ddraw/Clipper/clipper_main.c trunk/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c trunk/reactos/dll/directx/ddraw/Color/color_stubs.c trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c trunk/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c trunk/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c trunk/reactos/dll/directx/ddraw/Palette/createpalette.c trunk/reactos/dll/directx/ddraw/Palette/palette.c trunk/reactos/dll/directx/ddraw/Palette/palette_stubs.c trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface_main.c trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c trunk/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c trunk/reactos/dll/directx/ddraw/cleanup.c trunk/reactos/dll/directx/ddraw/main.c trunk/reactos/dll/directx/ddraw/startup.c trunk/reactos/dll/directx/dsound_new/property.c trunk/reactos/dll/directx/ksproxy/enum_mediatypes.cpp trunk/reactos/dll/directx/ksproxy/enumpins.cpp trunk/reactos/dll/directx/ksproxy/ksproxy.cpp trunk/reactos/dll/directx/ksproxy/qualityforward.cpp trunk/reactos/dll/directx/msdvbnp/scanningtuner.cpp trunk/reactos/dll/directx/msvidctl/enumtuningspaces.cpp trunk/reactos/dll/directx/msvidctl/tunerequest.cpp Modified: trunk/reactos/dll/directx/bdaplgin/bdaplgin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/bdapl… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/bdaplgin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/bdaplgin.cpp [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS BDA Proxy - * FILE: dll/directx/bdaplgin/classfactory.cpp + * FILE: dll/directx/bdaplgin/bdaplgin.cpp * PURPOSE: ClassFactory interface * * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) Modified: trunk/reactos/dll/directx/bdaplgin/devicecontrol.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/devic… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/devicecontrol.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/devicecontrol.cpp [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS BDA Proxy - * FILE: dll/directx/bdaplgin/classfactory.cpp + * FILE: dll/directx/bdaplgin/devicecontrol.cpp * PURPOSE: ClassFactory interface * * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) Modified: trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/pinco… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/pincontrol.cpp [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS BDA Proxy - * FILE: dll/directx/bdaplgin/classfactory.cpp + * FILE: dll/directx/bdaplgin/pincontrol.cpp * PURPOSE: ClassFactory interface * * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) Modified: trunk/reactos/dll/directx/bdaplgin/signalstatistics.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/signa… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/signalstatistics.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/signalstatistics.cpp [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS BDA Proxy - * FILE: dll/directx/bdaplgin/frequencyfilter.cpp + * FILE: dll/directx/bdaplgin/signalstatistics.cpp * PURPOSE: IBDA_FrequencyFilter interface * * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) Modified: trunk/reactos/dll/directx/d3d9/d3d9_cursor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_curs… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_cursor.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_cursor.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS ReactX - * FILE: dll/directx/d3d9/d3d9_cursor.h + * FILE: dll/directx/d3d9/d3d9_cursor.c * PURPOSE: d3d9.dll internal cursor methods * PROGRAMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> */ Modified: trunk/reactos/dll/directx/d3d9/d3d9_puredevice.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_pure… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_puredevice.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_puredevice.h [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS ReactX - * FILE: dll/directx/d3d9/d3d9_haldevice.h + * FILE: dll/directx/d3d9/d3d9_puredevice.h * PURPOSE: d3d9.dll internal device structures * PROGRAMERS: Gregor Gullwi <gbrunmar (dot) ros (at) gmail (dot) com> */ Modified: trunk/reactos/dll/directx/ddraw/Clipper/clipper_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Clipper/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Clipper/clipper_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Clipper/clipper_main.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/clipper/clipper_stubs.c + * FILE: dll/directx/ddraw/Clipper/clipper_main.c * PURPOSE: IDirectDrawClipper Implementation * PROGRAMMER: Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Clipper/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Clipper/clipper_stubs.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/clipper/clipper_stubs.c + * FILE: dll/directx/ddraw/Clipper/clipper_stubs.c * PURPOSE: IDirectDrawClipper Implementation * PROGRAMMER: Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Color/color_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Color/co… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Color/color_stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Color/color_stubs.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/color/color.c + * FILE: dll/directx/ddraw/Color/color_stubs.c * PURPOSE: IDirectDrawColorControl Implementation * PROGRAMMER: Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/ddraw/GetCaps.c + * FILE: dll/directx/ddraw/Ddraw/GetCaps.c * PURPOSE: IDirectDraw7 Implementation * PROGRAMMER: Magnus Olsen * Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/ddraw/GetDeviceIdentifier.c + * FILE: dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c * PURPOSE: IDirectDraw7 Implementation * PROGRAMMER: Magnus Olsen * Modified: trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/ca… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/ddraw/callbacks_dd_hel.c + * FILE: dll/directx/ddraw/Ddraw/callbacks_dd_hel.c * PURPOSE: HEL Callbacks for Direct Draw * PROGRAMMER: Magnus Olsen * Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/ddraw/ddraw_displaymode.c + * FILE: dll/directx/ddraw/Ddraw/ddraw_displaymode.c * PURPOSE: IDirectDraw7 Implementation * PROGRAMMER: Maarten Bosma, Magnus Olsen (add seh support) * Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/ddraw/ddraw_main.c + * FILE: dll/directx/ddraw/Ddraw/ddraw_main.c * PURPOSE: IDirectDraw7 Implementation * PROGRAMMER: Magnus Olsen, Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/ddraw/ddraw_main.c + * FILE: dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c * PURPOSE: IDirectDraw7::SetCooperativeLevel Implementation * PROGRAMMER: Magnus Olsen * Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/ddraw/ddraw_stubs.c + * FILE: dll/directx/ddraw/Ddraw/ddraw_stubs.c * PURPOSE: IDirectDraw7 Implementation * PROGRAMMER: Magnus Olsen, Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Gamma/ga… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Gamma/gamma_stubs.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/gamma/gamma_stubs.c + * FILE: dll/directx/ddraw/Gamma/gamma_stubs.c * PURPOSE: IDirectDrawGamma Implementation * PROGRAMMER: Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Kernel/k… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Kernel/kernel_stubs.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/kernel/kernel_stubs.c + * FILE: dll/directx/ddraw/Kernel/kernel_stubs.c * PURPOSE: IDirectDrawKernel and IDirectDrawSurfaceKernel Implementation * PROGRAMMER: Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Palette/createpalette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Palette/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Palette/createpalette.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Palette/createpalette.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/surface/createsurface.c + * FILE: dll/directx/ddraw/Palette/createpalette.c * PURPOSE: IDirectDrawPalette Creation * PROGRAMMER: Jérôme Gardou * Modified: trunk/reactos/dll/directx/ddraw/Palette/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Palette/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Palette/palette.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Palette/palette.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/Palette/palette.c + * FILE: dll/directx/ddraw/Palette/palette.c * PURPOSE: IDirectDrawPalette Implementation * PROGRAMMER: Jérôme Gardou * Modified: trunk/reactos/dll/directx/ddraw/Palette/palette_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Palette/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Palette/palette_stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Palette/palette_stubs.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/palette/palette_stubs.c + * FILE: dll/directx/ddraw/Palette/palette_stubs.c * PURPOSE: IDirectDrawPalette Implementation * PROGRAMMER: Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/surface/callbacks_surf_hel.c + * FILE: dll/directx/ddraw/Surface/callbacks_surf_hel.c * PURPOSE: HEL Callbacks For Surface APIs * PROGRAMMER: Magnus Olsen * Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/surface/createsurface.c + * FILE: dll/directx/ddraw/Surface/createsurface.c * PURPOSE: IDirectDrawSurface Creation * PROGRAMMER: Magnus Olsen * Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/surface/surface_main.c + * FILE: dll/directx/ddraw/Surface/surface_main.c * PURPOSE: IDirectDrawSurface7 Implementation * PROGRAMMER: Magnus Olsen, Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_stubs.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/surface/surface_stubs.c + * FILE: dll/directx/ddraw/Surface/surface_stubs.c * PURPOSE: IDirectDrawSurface7 Implementation * PROGRAMMER: Magnus Olsen, Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Videopor… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Videoport/videoport_stubs.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/videoport/videoport_stubs.c + * FILE: dll/directx/ddraw/Videoport/videoport_stubs.c * PURPOSE: IDirectDrawVideoPort, DDVideoPortContainer and IDirectDrawVideoPortNotify Implementation * PROGRAMMER: Maarten Bosma * Modified: trunk/reactos/dll/directx/ddraw/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/cleanup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/cleanup.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: lib/ddraw/ddraw.c + * FILE: dll/directx/ddraw/cleanup.c * PURPOSE: DirectDraw Library * PROGRAMMER: Magnus Olsen (greatlrd) * Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/main.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: lib/ddraw/ddraw.c + * FILE: dll/directx/ddraw/main.c * PURPOSE: DirectDraw Library * PROGRAMMER: Magnus Olsen (greatlrd) * Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/startup.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: lib/ddraw/ddraw.c + * FILE: dll/directx/ddraw/startup.c * PURPOSE: DirectDraw Library * PROGRAMMER: Magnus Olsen (greatlrd) * Modified: trunk/reactos/dll/directx/dsound_new/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/pro… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/property.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/property.c [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Configuration of network devices - * FILE: dll/directx/dsound_new/secondary.c + * FILE: dll/directx/dsound_new/property.c * PURPOSE: Secondary IDirectSoundBuffer8 implementation * * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) Modified: trunk/reactos/dll/directx/ksproxy/enum_mediatypes.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/enum_m… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/enum_mediatypes.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/enum_mediatypes.cpp [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Network Provider for MPEG2 based networks - * FILE: dll/directx/msdvbnp/enum_mediatypes.cpp + * FILE: dll/directx/ksproxy/enum_mediatypes.cpp * PURPOSE: IEnumMediaTypes interface * * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) Modified: trunk/reactos/dll/directx/ksproxy/enumpins.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/enumpi… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/enumpins.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/enumpins.cpp [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Network Provider for MPEG2 based networks - * FILE: dll/directx/msdvbnp/enumpins.cpp + * FILE: dll/directx/ksproxy/enumpins.cpp * PURPOSE: IEnumPins interface * * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) Modified: trunk/reactos/dll/directx/ksproxy/ksproxy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/ksprox… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/ksproxy.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/ksproxy.cpp [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WDM Streaming ActiveMovie Proxy - * FILE: dll/directx/ksproxy/ksproxy.c + * FILE: dll/directx/ksproxy/ksproxy.cpp * PURPOSE: ActiveMovie Proxy functions * * PROGRAMMERS: Dmitry Chapyshev Modified: trunk/reactos/dll/directx/ksproxy/qualityforward.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/qualit… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/qualityforward.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/qualityforward.cpp [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WDM Streaming ActiveMovie Proxy - * FILE: dll/directx/ksproxy/clockforward.cpp + * FILE: dll/directx/ksproxy/qualityforward.cpp * PURPOSE: IKsClockForwarder interface * * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) Modified: trunk/reactos/dll/directx/msdvbnp/scanningtuner.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdvbnp/scanni… ============================================================================== --- trunk/reactos/dll/directx/msdvbnp/scanningtuner.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdvbnp/scanningtuner.cpp [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Network Provider for MPEG2 based networks - * FILE: dll/directx/msdvbnp/networkprovider.cpp + * FILE: dll/directx/msdvbnp/scanningtuner.cpp * PURPOSE: IScanningTunner interface * * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) Modified: trunk/reactos/dll/directx/msvidctl/enumtuningspaces.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msvidctl/enumt… ============================================================================== --- trunk/reactos/dll/directx/msvidctl/enumtuningspaces.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msvidctl/enumtuningspaces.cpp [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS BDA Proxy - * FILE: dll/directx/msvidctl/tuningspace.cpp + * FILE: dll/directx/msvidctl/enumtuningspaces.cpp * PURPOSE: ITuningSpace interface * * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org) Modified: trunk/reactos/dll/directx/msvidctl/tunerequest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msvidctl/tuner… ============================================================================== --- trunk/reactos/dll/directx/msvidctl/tunerequest.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msvidctl/tunerequest.cpp [iso-8859-1] Sun Sep 27 14:00:29 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS BDA Proxy - * FILE: dll/directx/msvidctl/tuningspace.cpp + * FILE: dll/directx/msvidctl/tunerequest.cpp * PURPOSE: ITuningRequest interface * * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)reactos.org)

1 0

[gadamopoulos] 69371: Fix gcc build
by gadamopoulos＠svn.reactos.org 27 Sep '15

27 Sep '15

Author: gadamopoulos Date: Sun Sep 27 11:47:08 2015 New Revision: 69371 URL: http://svn.reactos.org/svn/reactos?rev=69371&view=rev Log: Fix gcc build Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] Sun Sep 27 11:47:08 2015 @@ -719,8 +719,8 @@ { /* Hardcode the command here; Executing a cpl file would be fine but we also need to run things like console.dll */ WCHAR wszParams[MAX_PATH]; - PWSTR wszFile = L"rundll32.exe"; - PWSTR wszFormat = L"shell32.dll,Control_RunDLL %s,%s"; + PCWSTR wszFile = L"rundll32.exe"; + PCWSTR wszFormat = L"shell32.dll,Control_RunDLL %s,%s"; wsprintfW(wszParams, wszFormat, pCPanel->szName, pCPanel->szName + pCPanel->offsDispName);

1 0

← Newer
1
2
3
4
5
6
7
8
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2015