Rename paint to mspaint to maintain script compatibility

See issue #6071 for more details.

svn path=/trunk/; revision=51415

diff --git a/reactos/base/applications/applications.rbuild b/reactos/base/applications/applications.rbuild
index 0a1265c..8255a9c 100644 (file)
--- a/reactos/base/applications/applications.rbuild
+++ b/reactos/base/applications/applications.rbuild
@@ -55,6 +55,9 @@
        <directory name="mscutils">
                <xi:include href="mscutils/directory.rbuild" />
        </directory>
+       <directory name="mspaint">
+               <xi:include href="mspaint/mspaint.rbuild" />
+       </directory>
        <directory name="mstsc">
                <xi:include href="mstsc/mstsc.rbuild" />
        </directory>
@@ -64,9 +67,6 @@
        <directory name="notepad">
                <xi:include href="notepad/notepad.rbuild" />
        </directory>
-       <directory name="paint">
-               <xi:include href="paint/paint.rbuild" />
-       </directory>
        <directory name="regedit">
                <xi:include href="regedit/regedit.rbuild" />
        </directory>

diff --git a/reactos/base/applications/paint/definitions.h b/reactos/base/applications/mspaint/definitions.h
similarity index 100%
rename from reactos/base/applications/paint/definitions.h
rename to reactos/base/applications/mspaint/definitions.h

diff --git a/reactos/base/applications/paint/dialogs.c b/reactos/base/applications/mspaint/dialogs.c
similarity index 100%
rename from reactos/base/applications/paint/dialogs.c
rename to reactos/base/applications/mspaint/dialogs.c

diff --git a/reactos/base/applications/paint/dialogs.h b/reactos/base/applications/mspaint/dialogs.h
similarity index 100%
rename from reactos/base/applications/paint/dialogs.h
rename to reactos/base/applications/mspaint/dialogs.h

diff --git a/reactos/base/applications/paint/dib.c b/reactos/base/applications/mspaint/dib.c
similarity index 100%
rename from reactos/base/applications/paint/dib.c
rename to reactos/base/applications/mspaint/dib.c

diff --git a/reactos/base/applications/paint/dib.h b/reactos/base/applications/mspaint/dib.h
similarity index 100%
rename from reactos/base/applications/paint/dib.h
rename to reactos/base/applications/mspaint/dib.h

diff --git a/reactos/base/applications/paint/drawing.c b/reactos/base/applications/mspaint/drawing.c
similarity index 100%
rename from reactos/base/applications/paint/drawing.c
rename to reactos/base/applications/mspaint/drawing.c

diff --git a/reactos/base/applications/paint/drawing.h b/reactos/base/applications/mspaint/drawing.h
similarity index 100%
rename from reactos/base/applications/paint/drawing.h
rename to reactos/base/applications/mspaint/drawing.h

diff --git a/reactos/base/applications/paint/globalvar.h b/reactos/base/applications/mspaint/globalvar.h
similarity index 100%
rename from reactos/base/applications/paint/globalvar.h
rename to reactos/base/applications/mspaint/globalvar.h

diff --git a/reactos/base/applications/paint/help/Paint.chm b/reactos/base/applications/mspaint/help/Paint.chm
similarity index 100%
rename from reactos/base/applications/paint/help/Paint.chm
rename to reactos/base/applications/mspaint/help/Paint.chm

diff --git a/reactos/base/applications/paint/help/Paint.hhp b/reactos/base/applications/mspaint/help/Paint.hhp
similarity index 100%
rename from reactos/base/applications/paint/help/Paint.hhp
rename to reactos/base/applications/mspaint/help/Paint.hhp

diff --git a/reactos/base/applications/paint/help/Table of Contents.hhc b/reactos/base/applications/mspaint/help/Table of Contents.hhc
similarity index 100%
rename from reactos/base/applications/paint/help/Table of Contents.hhc
rename to reactos/base/applications/mspaint/help/Table of Contents.hhc

diff --git a/reactos/base/applications/paint/help/airbrush.png b/reactos/base/applications/mspaint/help/airbrush.png
similarity index 100%
rename from reactos/base/applications/paint/help/airbrush.png
rename to reactos/base/applications/mspaint/help/airbrush.png

diff --git a/reactos/base/applications/paint/help/appwindow.png b/reactos/base/applications/mspaint/help/appwindow.png
similarity index 100%
rename from reactos/base/applications/paint/help/appwindow.png
rename to reactos/base/applications/mspaint/help/appwindow.png

diff --git a/reactos/base/applications/paint/help/bezier.png b/reactos/base/applications/mspaint/help/bezier.png
similarity index 100%
rename from reactos/base/applications/paint/help/bezier.png
rename to reactos/base/applications/mspaint/help/bezier.png

diff --git a/reactos/base/applications/paint/help/brush.png b/reactos/base/applications/mspaint/help/brush.png
similarity index 100%
rename from reactos/base/applications/paint/help/brush.png
rename to reactos/base/applications/mspaint/help/brush.png

diff --git a/reactos/base/applications/paint/help/color.png b/reactos/base/applications/mspaint/help/color.png
similarity index 100%
rename from reactos/base/applications/paint/help/color.png
rename to reactos/base/applications/mspaint/help/color.png

diff --git a/reactos/base/applications/paint/help/ellipse.png b/reactos/base/applications/mspaint/help/ellipse.png
similarity index 100%
rename from reactos/base/applications/paint/help/ellipse.png
rename to reactos/base/applications/mspaint/help/ellipse.png

diff --git a/reactos/base/applications/paint/help/fill.png b/reactos/base/applications/mspaint/help/fill.png
similarity index 100%
rename from reactos/base/applications/paint/help/fill.png
rename to reactos/base/applications/mspaint/help/fill.png

diff --git a/reactos/base/applications/paint/help/freesel.png b/reactos/base/applications/mspaint/help/freesel.png
similarity index 100%
rename from reactos/base/applications/paint/help/freesel.png
rename to reactos/base/applications/mspaint/help/freesel.png

diff --git a/reactos/base/applications/paint/help/line.png b/reactos/base/applications/mspaint/help/line.png
similarity index 100%
rename from reactos/base/applications/paint/help/line.png
rename to reactos/base/applications/mspaint/help/line.png

diff --git a/reactos/base/applications/paint/help/palette.png b/reactos/base/applications/mspaint/help/palette.png
similarity index 100%
rename from reactos/base/applications/paint/help/palette.png
rename to reactos/base/applications/mspaint/help/palette.png

diff --git a/reactos/base/applications/paint/help/pen.png b/reactos/base/applications/mspaint/help/pen.png
similarity index 100%
rename from reactos/base/applications/paint/help/pen.png
rename to reactos/base/applications/mspaint/help/pen.png

diff --git a/reactos/base/applications/paint/help/rect.png b/reactos/base/applications/mspaint/help/rect.png
similarity index 100%
rename from reactos/base/applications/paint/help/rect.png
rename to reactos/base/applications/mspaint/help/rect.png

diff --git a/reactos/base/applications/paint/help/rectsel.png b/reactos/base/applications/mspaint/help/rectsel.png
similarity index 100%
rename from reactos/base/applications/paint/help/rectsel.png
rename to reactos/base/applications/mspaint/help/rectsel.png

diff --git a/reactos/base/applications/paint/help/rrect.png b/reactos/base/applications/mspaint/help/rrect.png
similarity index 100%
rename from reactos/base/applications/paint/help/rrect.png
rename to reactos/base/applications/mspaint/help/rrect.png

diff --git a/reactos/base/applications/paint/help/rubber.png b/reactos/base/applications/mspaint/help/rubber.png
similarity index 100%
rename from reactos/base/applications/paint/help/rubber.png
rename to reactos/base/applications/mspaint/help/rubber.png

diff --git a/reactos/base/applications/paint/help/settings.html b/reactos/base/applications/mspaint/help/settings.html
similarity index 100%
rename from reactos/base/applications/paint/help/settings.html
rename to reactos/base/applications/mspaint/help/settings.html

diff --git a/reactos/base/applications/paint/help/settings1.png b/reactos/base/applications/mspaint/help/settings1.png
similarity index 100%
rename from reactos/base/applications/paint/help/settings1.png
rename to reactos/base/applications/mspaint/help/settings1.png

diff --git a/reactos/base/applications/paint/help/settings2.png b/reactos/base/applications/mspaint/help/settings2.png
similarity index 100%
rename from reactos/base/applications/paint/help/settings2.png
rename to reactos/base/applications/mspaint/help/settings2.png

diff --git a/reactos/base/applications/paint/help/settings3.png b/reactos/base/applications/mspaint/help/settings3.png
similarity index 100%
rename from reactos/base/applications/paint/help/settings3.png
rename to reactos/base/applications/mspaint/help/settings3.png

diff --git a/reactos/base/applications/paint/help/settings4.png b/reactos/base/applications/mspaint/help/settings4.png
similarity index 100%
rename from reactos/base/applications/paint/help/settings4.png
rename to reactos/base/applications/mspaint/help/settings4.png

diff --git a/reactos/base/applications/paint/help/settings5.png b/reactos/base/applications/mspaint/help/settings5.png
similarity index 100%
rename from reactos/base/applications/paint/help/settings5.png
rename to reactos/base/applications/mspaint/help/settings5.png

diff --git a/reactos/base/applications/paint/help/settings6.png b/reactos/base/applications/mspaint/help/settings6.png
similarity index 100%
rename from reactos/base/applications/paint/help/settings6.png
rename to reactos/base/applications/mspaint/help/settings6.png

diff --git a/reactos/base/applications/paint/help/shape.png b/reactos/base/applications/mspaint/help/shape.png
similarity index 100%
rename from reactos/base/applications/paint/help/shape.png
rename to reactos/base/applications/mspaint/help/shape.png

diff --git a/reactos/base/applications/paint/help/text.png b/reactos/base/applications/mspaint/help/text.png
similarity index 100%
rename from reactos/base/applications/paint/help/text.png
rename to reactos/base/applications/mspaint/help/text.png

diff --git a/reactos/base/applications/paint/help/toolbox.png b/reactos/base/applications/mspaint/help/toolbox.png
similarity index 100%
rename from reactos/base/applications/paint/help/toolbox.png
rename to reactos/base/applications/mspaint/help/toolbox.png

diff --git a/reactos/base/applications/paint/help/tools.html b/reactos/base/applications/mspaint/help/tools.html
similarity index 100%
rename from reactos/base/applications/paint/help/tools.html
rename to reactos/base/applications/mspaint/help/tools.html

diff --git a/reactos/base/applications/paint/help/usage.html b/reactos/base/applications/mspaint/help/usage.html
similarity index 100%
rename from reactos/base/applications/paint/help/usage.html
rename to reactos/base/applications/mspaint/help/usage.html

diff --git a/reactos/base/applications/paint/help/zoom.png b/reactos/base/applications/mspaint/help/zoom.png
similarity index 100%
rename from reactos/base/applications/paint/help/zoom.png
rename to reactos/base/applications/mspaint/help/zoom.png

diff --git a/reactos/base/applications/paint/history.c b/reactos/base/applications/mspaint/history.c
similarity index 100%
rename from reactos/base/applications/paint/history.c
rename to reactos/base/applications/mspaint/history.c

diff --git a/reactos/base/applications/paint/history.h b/reactos/base/applications/mspaint/history.h
similarity index 100%
rename from reactos/base/applications/paint/history.h
rename to reactos/base/applications/mspaint/history.h

diff --git a/reactos/base/applications/paint/icons.rc b/reactos/base/applications/mspaint/icons.rc
similarity index 100%
rename from reactos/base/applications/paint/icons.rc
rename to reactos/base/applications/mspaint/icons.rc

diff --git a/reactos/base/applications/paint/icons/airbrush_cur.ico b/reactos/base/applications/mspaint/icons/airbrush_cur.ico
similarity index 100%
rename from reactos/base/applications/paint/icons/airbrush_cur.ico
rename to reactos/base/applications/mspaint/icons/airbrush_cur.ico

diff --git a/reactos/base/applications/paint/icons/color_cur.ico b/reactos/base/applications/mspaint/icons/color_cur.ico
similarity index 100%
rename from reactos/base/applications/paint/icons/color_cur.ico
rename to reactos/base/applications/mspaint/icons/color_cur.ico

diff --git a/reactos/base/applications/paint/icons/fill_cur.ico b/reactos/base/applications/mspaint/icons/fill_cur.ico
similarity index 100%
rename from reactos/base/applications/paint/icons/fill_cur.ico
rename to reactos/base/applications/mspaint/icons/fill_cur.ico

diff --git a/reactos/base/applications/paint/icons/horzstretch.ico b/reactos/base/applications/mspaint/icons/horzstretch.ico
similarity index 100%
rename from reactos/base/applications/paint/icons/horzstretch.ico
rename to reactos/base/applications/mspaint/icons/horzstretch.ico

diff --git a/reactos/base/applications/paint/icons/iconbar.bmp b/reactos/base/applications/mspaint/icons/iconbar.bmp
similarity index 100%
rename from reactos/base/applications/paint/icons/iconbar.bmp
rename to reactos/base/applications/mspaint/icons/iconbar.bmp

diff --git a/reactos/base/applications/paint/icons/nontransparent.ico b/reactos/base/applications/mspaint/icons/nontransparent.ico
similarity index 100%
rename from reactos/base/applications/paint/icons/nontransparent.ico
rename to reactos/base/applications/mspaint/icons/nontransparent.ico

diff --git a/reactos/base/applications/paint/icons/paint.ico b/reactos/base/applications/mspaint/icons/paint.ico
similarity index 100%
rename from reactos/base/applications/paint/icons/paint.ico
rename to reactos/base/applications/mspaint/icons/paint.ico

diff --git a/reactos/base/applications/paint/icons/paint.svg b/reactos/base/applications/mspaint/icons/paint.svg
similarity index 100%
rename from reactos/base/applications/paint/icons/paint.svg
rename to reactos/base/applications/mspaint/icons/paint.svg

diff --git a/reactos/base/applications/paint/icons/pen_cur.ico b/reactos/base/applications/mspaint/icons/pen_cur.ico
similarity index 100%
rename from reactos/base/applications/paint/icons/pen_cur.ico
rename to reactos/base/applications/mspaint/icons/pen_cur.ico

diff --git a/reactos/base/applications/paint/icons/transparency.xcf b/reactos/base/applications/mspaint/icons/transparency.xcf
similarity index 100%
rename from reactos/base/applications/paint/icons/transparency.xcf
rename to reactos/base/applications/mspaint/icons/transparency.xcf

diff --git a/reactos/base/applications/paint/icons/transparent.ico b/reactos/base/applications/mspaint/icons/transparent.ico
similarity index 100%
rename from reactos/base/applications/paint/icons/transparent.ico
rename to reactos/base/applications/mspaint/icons/transparent.ico

diff --git a/reactos/base/applications/paint/icons/vertstretch.ico b/reactos/base/applications/mspaint/icons/vertstretch.ico
similarity index 100%
rename from reactos/base/applications/paint/icons/vertstretch.ico
rename to reactos/base/applications/mspaint/icons/vertstretch.ico

diff --git a/reactos/base/applications/paint/icons/zoom_cur.ico b/reactos/base/applications/mspaint/icons/zoom_cur.ico
similarity index 100%
rename from reactos/base/applications/paint/icons/zoom_cur.ico
rename to reactos/base/applications/mspaint/icons/zoom_cur.ico

diff --git a/reactos/base/applications/paint/lang/bg-BG.rc b/reactos/base/applications/mspaint/lang/bg-BG.rc
similarity index 100%
rename from reactos/base/applications/paint/lang/bg-BG.rc
rename to reactos/base/applications/mspaint/lang/bg-BG.rc

diff --git a/reactos/base/applications/paint/lang/cs-CZ.rc b/reactos/base/applications/mspaint/lang/cs-CZ.rc
similarity index 100%
rename from reactos/base/applications/paint/lang/cs-CZ.rc
rename to reactos/base/applications/mspaint/lang/cs-CZ.rc

diff --git a/reactos/base/applications/paint/lang/de-DE.rc b/reactos/base/applications/mspaint/lang/de-DE.rc
similarity index 100%
rename from reactos/base/applications/paint/lang/de-DE.rc
rename to reactos/base/applications/mspaint/lang/de-DE.rc

diff --git a/reactos/base/applications/paint/lang/en-GB.rc b/reactos/base/applications/mspaint/lang/en-GB.rc
similarity index 100%
rename from reactos/base/applications/paint/lang/en-GB.rc
rename to reactos/base/applications/mspaint/lang/en-GB.rc

diff --git a/reactos/base/applications/paint/lang/en-US.rc b/reactos/base/applications/mspaint/lang/en-US.rc
similarity index 100%
rename from reactos/base/applications/paint/lang/en-US.rc
rename to reactos/base/applications/mspaint/lang/en-US.rc

diff --git a/reactos/base/applications/paint/lang/es-ES.rc b/reactos/base/applications/mspaint/lang/es-ES.rc
similarity index 100%
rename from reactos/base/applications/paint/lang/es-ES.rc
rename to reactos/base/applications/mspaint/lang/es-ES.rc

diff --git a/reactos/base/applications/paint/lang/eu-ES.rc b/reactos/base/applications/mspaint/lang/eu-ES.rc
similarity index 100%
rename from reactos/base/applications/paint/lang/eu-ES.rc
rename to reactos/base/applications/mspaint/lang/eu-ES.rc

diff --git a/reactos/base/applications/paint/lang/fr-FR.rc b/reactos/base/applications/mspaint/lang/fr-FR.rc
similarity index 100%
rename from reactos/base/applications/paint/lang/fr-FR.rc
rename to reactos/base/applications/mspaint/lang/fr-FR.rc

diff --git a/reactos/base/applications/paint/lang/hu-HU.rc b/reactos/base/applications/mspaint/lang/hu-HU.rc
similarity index 100%
rename from reactos/base/applications/paint/lang/hu-HU.rc
rename to reactos/base/applications/mspaint/lang/hu-HU.rc

diff --git a/reactos/base/applications/paint/lang/it-IT.rc b/reactos/base/applications/mspaint/lang/it-IT.rc
similarity index 100%
rename from reactos/base/applications/paint/lang/it-IT.rc
rename to reactos/base/applications/mspaint/lang/it-IT.rc

diff --git a/reactos/base/applications/paint/lang/ja-JP.rc b/reactos/base/applications/mspaint/lang/ja-JP.rc
similarity index 100%
rename from reactos/base/applications/paint/lang/ja-JP.rc
rename to reactos/base/applications/mspaint/lang/ja-JP.rc

diff --git a/reactos/base/applications/paint/lang/nl-NL.rc b/reactos/base/applications/mspaint/lang/nl-NL.rc
similarity index 100%
rename from reactos/base/applications/paint/lang/nl-NL.rc
rename to reactos/base/applications/mspaint/lang/nl-NL.rc

diff --git a/reactos/base/applications/paint/lang/no-NO.rc b/reactos/base/applications/mspaint/lang/no-NO.rc
similarity index 100%
rename from reactos/base/applications/paint/lang/no-NO.rc
rename to reactos/base/applications/mspaint/lang/no-NO.rc

diff --git a/reactos/base/applications/paint/lang/pl-PL.rc b/reactos/base/applications/mspaint/lang/pl-PL.rc
similarity index 100%
rename from reactos/base/applications/paint/lang/pl-PL.rc
rename to reactos/base/applications/mspaint/lang/pl-PL.rc

diff --git a/reactos/base/applications/paint/lang/pt-BR.rc b/reactos/base/applications/mspaint/lang/pt-BR.rc
similarity index 100%
rename from reactos/base/applications/paint/lang/pt-BR.rc
rename to reactos/base/applications/mspaint/lang/pt-BR.rc

diff --git a/reactos/base/applications/paint/lang/pt-PT.rc b/reactos/base/applications/mspaint/lang/pt-PT.rc
similarity index 100%
rename from reactos/base/applications/paint/lang/pt-PT.rc
rename to reactos/base/applications/mspaint/lang/pt-PT.rc

diff --git a/reactos/base/applications/paint/lang/ro-RO.rc b/reactos/base/applications/mspaint/lang/ro-RO.rc
similarity index 100%
rename from reactos/base/applications/paint/lang/ro-RO.rc
rename to reactos/base/applications/mspaint/lang/ro-RO.rc

diff --git a/reactos/base/applications/paint/lang/ru-RU.rc b/reactos/base/applications/mspaint/lang/ru-RU.rc
similarity index 100%
rename from reactos/base/applications/paint/lang/ru-RU.rc
rename to reactos/base/applications/mspaint/lang/ru-RU.rc

diff --git a/reactos/base/applications/paint/lang/sk-SK.rc b/reactos/base/applications/mspaint/lang/sk-SK.rc
similarity index 100%
rename from reactos/base/applications/paint/lang/sk-SK.rc
rename to reactos/base/applications/mspaint/lang/sk-SK.rc

diff --git a/reactos/base/applications/paint/lang/uk-UA.rc b/reactos/base/applications/mspaint/lang/uk-UA.rc
similarity index 100%
rename from reactos/base/applications/paint/lang/uk-UA.rc
rename to reactos/base/applications/mspaint/lang/uk-UA.rc

diff --git a/reactos/base/applications/paint/main.c b/reactos/base/applications/mspaint/main.c
similarity index 100%
rename from reactos/base/applications/paint/main.c
rename to reactos/base/applications/mspaint/main.c

diff --git a/reactos/base/applications/paint/mouse.c b/reactos/base/applications/mspaint/mouse.c
similarity index 100%
rename from reactos/base/applications/paint/mouse.c
rename to reactos/base/applications/mspaint/mouse.c

diff --git a/reactos/base/applications/paint/mouse.h b/reactos/base/applications/mspaint/mouse.h
similarity index 100%
rename from reactos/base/applications/paint/mouse.h
rename to reactos/base/applications/mspaint/mouse.h

diff --git a/reactos/base/applications/paint/paint.exe.amd64.manifest b/reactos/base/applications/mspaint/mspaint.exe.amd64.manifest
similarity index 100%
rename from reactos/base/applications/paint/paint.exe.amd64.manifest
rename to reactos/base/applications/mspaint/mspaint.exe.amd64.manifest

diff --git a/reactos/base/applications/paint/paint.exe.manifest b/reactos/base/applications/mspaint/mspaint.exe.manifest
similarity index 100%
rename from reactos/base/applications/paint/paint.exe.manifest
rename to reactos/base/applications/mspaint/mspaint.exe.manifest

diff --git a/reactos/base/applications/paint/paint.rbuild b/reactos/base/applications/mspaint/mspaint.rbuild
similarity index 77%
rename from reactos/base/applications/paint/paint.rbuild
rename to reactos/base/applications/mspaint/mspaint.rbuild
index f20fc0a..7f1c410 100644 (file)
--- a/reactos/base/applications/paint/paint.rbuild
+++ b/reactos/base/applications/mspaint/mspaint.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="paint" type="win32gui" installbase="system32" installname="paint.exe" unicode="yes" allowwarnings="true">
-       <include base="paint">.</include>
+<module name="mspaint" type="win32gui" installbase="system32" installname="mspaint.exe" unicode="yes" allowwarnings="true">
+       <include base="mspaint">.</include>
        <library>comdlg32</library>
        <library>shell32</library>
        <library>user32</library>

diff --git a/reactos/base/applications/paint/palette.c b/reactos/base/applications/mspaint/palette.c
similarity index 100%
rename from reactos/base/applications/paint/palette.c
rename to reactos/base/applications/mspaint/palette.c

diff --git a/reactos/base/applications/paint/palette.h b/reactos/base/applications/mspaint/palette.h
similarity index 100%
rename from reactos/base/applications/paint/palette.h
rename to reactos/base/applications/mspaint/palette.h

diff --git a/reactos/base/applications/paint/registry.c b/reactos/base/applications/mspaint/registry.c
similarity index 100%
rename from reactos/base/applications/paint/registry.c
rename to reactos/base/applications/mspaint/registry.c

diff --git a/reactos/base/applications/paint/registry.h b/reactos/base/applications/mspaint/registry.h
similarity index 100%
rename from reactos/base/applications/paint/registry.h
rename to reactos/base/applications/mspaint/registry.h

diff --git a/reactos/base/applications/paint/rsrc.rc b/reactos/base/applications/mspaint/rsrc.rc
similarity index 100%
rename from reactos/base/applications/paint/rsrc.rc
rename to reactos/base/applications/mspaint/rsrc.rc

diff --git a/reactos/base/applications/paint/selection.c b/reactos/base/applications/mspaint/selection.c
similarity index 100%
rename from reactos/base/applications/paint/selection.c
rename to reactos/base/applications/mspaint/selection.c

diff --git a/reactos/base/applications/paint/selection.h b/reactos/base/applications/mspaint/selection.h
similarity index 100%
rename from reactos/base/applications/paint/selection.h
rename to reactos/base/applications/mspaint/selection.h

diff --git a/reactos/base/applications/paint/sizebox.c b/reactos/base/applications/mspaint/sizebox.c
similarity index 100%
rename from reactos/base/applications/paint/sizebox.c
rename to reactos/base/applications/mspaint/sizebox.c

diff --git a/reactos/base/applications/paint/sizebox.h b/reactos/base/applications/mspaint/sizebox.h
similarity index 100%
rename from reactos/base/applications/paint/sizebox.h
rename to reactos/base/applications/mspaint/sizebox.h

diff --git a/reactos/base/applications/paint/toolsettings.c b/reactos/base/applications/mspaint/toolsettings.c
similarity index 100%
rename from reactos/base/applications/paint/toolsettings.c
rename to reactos/base/applications/mspaint/toolsettings.c

diff --git a/reactos/base/applications/paint/toolsettings.h b/reactos/base/applications/mspaint/toolsettings.h
similarity index 100%
rename from reactos/base/applications/paint/toolsettings.h
rename to reactos/base/applications/mspaint/toolsettings.h

diff --git a/reactos/base/applications/paint/winproc.c b/reactos/base/applications/mspaint/winproc.c
similarity index 100%
rename from reactos/base/applications/paint/winproc.c
rename to reactos/base/applications/mspaint/winproc.c

diff --git a/reactos/base/applications/paint/winproc.h b/reactos/base/applications/mspaint/winproc.h
similarity index 100%
rename from reactos/base/applications/paint/winproc.h
rename to reactos/base/applications/mspaint/winproc.h

diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index 9019e79..47d5ee4 100644 (file)
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -60,6 +60,7 @@ base\applications\msconfig\msconfig.exe                 1
 base\applications\mscutils\devmgmt\devmgmt.exe          1
 base\applications\mscutils\eventvwr\eventvwr.exe        1
 base\applications\mscutils\servman\servman.exe          1
+base\applications\mspaint\mspaint.exe                   1
 base\applications\mstsc\mstsc.exe                       1
 base\applications\network\arp\arp.exe                   1
 base\applications\network\dwnl\dwnl.exe                 1
@@ -75,7 +76,6 @@ base\applications\network\telnet\telnet.exe             1
 base\applications\network\tracert\tracert.exe           1
 base\applications\network\whois\whois.exe               1
 base\applications\notepad\notepad.exe                   1
-base\applications\paint\paint.exe                       1
 base\applications\rapps\rapps.exe                       1
 base\applications\regedit\regedit.exe                   4
 base\applications\regedit\clb\clb.dll                   1

diff --git a/reactos/dll/win32/syssetup/install.c b/reactos/dll/win32/syssetup/install.c
index 59b3247..fb3a580 100644 (file)
--- a/reactos/dll/win32/syssetup/install.c
+++ b/reactos/dll/win32/syssetup/install.c
@@ -793,7 +793,7 @@ CreateShortcuts(VOID)
         CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_RDESKTOP, _T("%SystemRoot%\\system32\\mstsc.exe"), IDS_CMT_RDESKTOP, TRUE);
         CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNAP, _T("%SystemRoot%\\system32\\screenshot.exe"), IDS_CMT_SCREENSHOT, TRUE);
         CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WORDPAD, _T("%SystemRoot%\\system32\\wordpad.exe"), IDS_CMT_WORDPAD, TRUE);
-        CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_PAINT, _T("%SystemRoot%\\system32\\paint.exe"), IDS_CMT_PAINT, TRUE);
+        CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_PAINT, _T("%SystemRoot%\\system32\\mspaint.exe"), IDS_CMT_PAINT, TRUE);
     }
 
     /* Create System Tools subfolder and fill if the exe is available */