Author: gschneider
Date: Thu Apr 21 21:05:47 2011
New Revision: 51415
URL: http://svn.reactos.org/svn/reactos?rev=51415&view=rev
Log:
Rename paint to mspaint to maintain script compatibility
See issue #6071 for more details.
Added:
trunk/reactos/base/applications/mspaint/
- copied from r51414, trunk/reactos/base/applications/paint/
trunk/reactos/base/applications/mspaint/mspaint.exe.amd64.manifest
- copied unchanged from r51414,
trunk/reactos/base/applications/paint/paint.exe.amd64.manifest
trunk/reactos/base/applications/mspaint/mspaint.exe.manifest
- copied unchanged from r51414,
trunk/reactos/base/applications/paint/paint.exe.manifest
trunk/reactos/base/applications/mspaint/mspaint.rbuild
- copied, changed from r51414,
trunk/reactos/base/applications/paint/paint.rbuild
Removed:
trunk/reactos/base/applications/mspaint/paint.exe.amd64.manifest
trunk/reactos/base/applications/mspaint/paint.exe.manifest
trunk/reactos/base/applications/mspaint/paint.rbuild
trunk/reactos/base/applications/paint/
Modified:
trunk/reactos/base/applications/applications.rbuild
trunk/reactos/boot/bootdata/packages/reactos.dff
trunk/reactos/dll/win32/syssetup/install.c
Modified: trunk/reactos/base/applications/applications.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applications.rbuild?rev=51415&r1=51414&r2=51415&view=diff
==============================================================================
--- trunk/reactos/base/applications/applications.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/applications.rbuild [iso-8859-1] Thu Apr 21
21:05:47 2011
@@ -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>
@@ -63,9 +66,6 @@
</directory>
<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" />
Copied: trunk/reactos/base/applications/mspaint/mspaint.rbuild (from r51414,
trunk/reactos/base/applications/paint/paint.rbuild)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/mspaint.rbuild?p2=trunk/reactos/base/applications/mspaint/mspaint.rbuild&p1=trunk/reactos/base/applications/paint/paint.rbuild&r1=51414&r2=51415&rev=51415&view=diff
==============================================================================
--- trunk/reactos/base/applications/paint/paint.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint/mspaint.rbuild [iso-8859-1] Thu Apr
21 21:05:47 2011
@@ -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>
Removed: trunk/reactos/base/applications/mspaint/paint.exe.amd64.manifest
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/paint.exe.amd64.manifest?rev=51414&view=auto
==============================================================================
--- trunk/reactos/base/applications/mspaint/paint.exe.amd64.manifest
[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint/paint.exe.amd64.manifest (removed)
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly
- xmlns="urn:schemas-microsoft-com:asm.v1"
- manifestVersion="1.0">
-<assemblyIdentity
- name="DevCpp.Apps.Paint"
- processorArchitecture="amd64"
- version="1.0.0.0"
- type="win32"/>
-<description>Paint</description>
-<dependency>
- <dependentAssembly>
- <assemblyIdentity
- type="win32"
- name="Microsoft.Windows.Common-Controls"
- version="6.0.0.0"
- processorArchitecture="amd64"
- publicKeyToken="6595b64144ccf1df"
- language="*"
- />
- </dependentAssembly>
-</dependency>
-</assembly>
Removed: trunk/reactos/base/applications/mspaint/paint.exe.manifest
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/paint.exe.manifest?rev=51414&view=auto
==============================================================================
--- trunk/reactos/base/applications/mspaint/paint.exe.manifest [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/mspaint/paint.exe.manifest (removed)
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly
- xmlns="urn:schemas-microsoft-com:asm.v1"
- manifestVersion="1.0">
-<assemblyIdentity
- name="DevCpp.Apps.Paint"
- processorArchitecture="x86"
- version="1.0.0.0"
- type="win32"/>
-<description>Paint</description>
-<dependency>
- <dependentAssembly>
- <assemblyIdentity
- type="win32"
- name="Microsoft.Windows.Common-Controls"
- version="6.0.0.0"
- processorArchitecture="x86"
- publicKeyToken="6595b64144ccf1df"
- language="*"
- />
- </dependentAssembly>
-</dependency>
-</assembly>
Removed: trunk/reactos/base/applications/mspaint/paint.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/paint.rbuild?rev=51414&view=auto
==============================================================================
--- trunk/reactos/base/applications/mspaint/paint.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint/paint.rbuild (removed)
@@ -1,24 +1,0 @@
-<?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>
- <library>comdlg32</library>
- <library>shell32</library>
- <library>user32</library>
- <library>gdi32</library>
- <library>advapi32</library>
- <library>comctl32</library>
- <file>dialogs.c</file>
- <file>dib.c</file>
- <file>drawing.c</file>
- <file>history.c</file>
- <file>main.c</file>
- <file>mouse.c</file>
- <file>palette.c</file>
- <file>registry.c</file>
- <file>selection.c</file>
- <file>sizebox.c</file>
- <file>toolsettings.c</file>
- <file>winproc.c</file>
- <file>rsrc.rc</file>
-</module>
Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/reactos.dff?rev=51415&r1=51414&r2=51415&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu Apr 21
21:05:47 2011
@@ -60,6 +60,7 @@
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\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
Modified: trunk/reactos/dll/win32/syssetup/install.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install.c?rev=51415&r1=51414&r2=51415&view=diff
==============================================================================
--- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Thu Apr 21 21:05:47
2011
@@ -793,7 +793,7 @@
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 */
