Revert Manifest Commits due to popular demand. They will be Autogenerated by RBuild...

svn path=/trunk/; revision=31671

diff --git a/rosapps/applications/screensavers/butterflies/butterflies.rc b/rosapps/applications/screensavers/butterflies/butterflies.rc
index 607e4db..d9dff02 100644 (file)
--- a/rosapps/applications/screensavers/butterflies/butterflies.rc
+++ b/rosapps/applications/screensavers/butterflies/butterflies.rc
@@ -7,9 +7,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #define REACTOS_STR_FILE_DESCRIPTION    "Butterflies ScreenSaver\0"
 #define REACTOS_STR_INTERNAL_NAME       "butterflies\0"
 #define REACTOS_STR_ORIGINAL_FILENAME   "butterflies.scr\0"
-
-1 24 DISCARDABLE "manifest.xml"
-
 #include <reactos/version.rc>
 
 IDB_BUTTERFLY1   BITMAP   "res/butterfly1.bmp"

diff --git a/rosapps/applications/screensavers/butterflies/manifest.xml b/rosapps/applications/screensavers/butterflies/manifest.xml
deleted file mode 100644 (file)
index a949447..0000000
--- a/rosapps/applications/screensavers/butterflies/manifest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <assemblyIdentity
-  version="1.0.0.0"
-  processorArchitecture="X86"
-  name="ReactOS.Application.Butterflies"
-  type="win32"
- />
- <description>ReactOS Butterflies Screensaver</description>
- <dependency>
-  <dependentAssembly>
-   <assemblyIdentity
-    type="win32"
-    name="Microsoft.Windows.Common-Controls"
-    version="6.0.0.0"
-    processorArchitecture="X86"
-    publicKeyToken="6595b64144ccf1df"
-    language="*"
-   />
-  </dependentAssembly>
- </dependency>
-</assembly>
-
-<!-- EOF -->

diff --git a/rosapps/applications/screensavers/matrix/manifest.xml b/rosapps/applications/screensavers/matrix/manifest.xml
deleted file mode 100644 (file)
index 34f8bab..0000000
--- a/rosapps/applications/screensavers/matrix/manifest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <assemblyIdentity
-  version="1.0.0.0"
-  processorArchitecture="X86"
-  name="ReactOS.Application.Matrix"
-  type="win32"
- />
- <description>ReactOS Matrix Screensaver</description>
- <dependency>
-  <dependentAssembly>
-   <assemblyIdentity
-    type="win32"
-    name="Microsoft.Windows.Common-Controls"
-    version="6.0.0.0"
-    processorArchitecture="X86"
-    publicKeyToken="6595b64144ccf1df"
-    language="*"
-   />
-  </dependentAssembly>
- </dependency>
-</assembly>
-
-<!-- EOF -->

diff --git a/rosapps/applications/screensavers/matrix/rsrc.rc b/rosapps/applications/screensavers/matrix/rsrc.rc
index 65ef149..89a32e5 100644 (file)
--- a/rosapps/applications/screensavers/matrix/rsrc.rc
+++ b/rosapps/applications/screensavers/matrix/rsrc.rc
@@ -7,8 +7,6 @@ IDB_BITMAP1      BITMAP  DISCARDABLE  "matrix.bmp"
 IDC_BLANKCURSOR  CURSOR  DISCARDABLE  "cursor1.cur"
 IDI_ICON1        ICON    DISCARDABLE  "icon1.ico"
 
-1 24 DISCARDABLE "manifest.xml"
-
 #include "lang/bg-BG.rc"
 #include "lang/de-DE.rc"
 #include "lang/en-US.rc"

diff --git a/rosapps/imagesoft/manifest.xml b/rosapps/imagesoft/manifest.xml
index d944a78..dc84acc 100644 (file)
--- a/rosapps/imagesoft/manifest.xml
+++ b/rosapps/imagesoft/manifest.xml
@@ -3,10 +3,10 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.Application.ImageSoft"
+  name="ReactOS.VMware.SVGA.Installer"
   type="win32"
  />
- <description>ReactOS ImageSoft</description>
+ <description>ReactOS VMware(r) SVGA driver Installer</description>
  <dependency>
   <dependentAssembly>
    <assemblyIdentity

diff --git a/rosapps/magnify/magnify.rc b/rosapps/magnify/magnify.rc
index 7193903..9ea3ddc 100644 (file)
--- a/rosapps/magnify/magnify.rc
+++ b/rosapps/magnify/magnify.rc
@@ -10,8 +10,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 #include <reactos/version.rc>
 
-1 24 DISCARDABLE "manifest.xml"
-
 IDI_ICON ICON "res/magnify.ico"
 
 #include "rsrc.rc"

diff --git a/rosapps/magnify/manifest.xml b/rosapps/magnify/manifest.xml
deleted file mode 100644 (file)
index 0bec512..0000000
--- a/rosapps/magnify/manifest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <assemblyIdentity
-  version="1.0.0.0"
-  processorArchitecture="X86"
-  name="ReactOS.Application.Magnify"
-  type="win32"
- />
- <description>ReactOS Magnifier</description>
- <dependency>
-  <dependentAssembly>
-   <assemblyIdentity
-    type="win32"
-    name="Microsoft.Windows.Common-Controls"
-    version="6.0.0.0"
-    processorArchitecture="X86"
-    publicKeyToken="6595b64144ccf1df"
-    language="*"
-   />
-  </dependentAssembly>
- </dependency>
-</assembly>
-
-<!-- EOF -->

diff --git a/rosapps/old_wordpad/manifest.xml b/rosapps/old_wordpad/manifest.xml
index 8ebdb4d..dc84acc 100644 (file)
--- a/rosapps/old_wordpad/manifest.xml
+++ b/rosapps/old_wordpad/manifest.xml
@@ -3,10 +3,10 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.Application.WordPad"
+  name="ReactOS.VMware.SVGA.Installer"
   type="win32"
  />
- <description>ReactOS Word Pad</description>
+ <description>ReactOS VMware(r) SVGA driver Installer</description>
  <dependency>
   <dependentAssembly>
    <assemblyIdentity

diff --git a/rosapps/roscalc/manifest.xml b/rosapps/roscalc/manifest.xml
index 73b5c9a..6bba476 100644 (file)
--- a/rosapps/roscalc/manifest.xml
+++ b/rosapps/roscalc/manifest.xml
@@ -3,7 +3,7 @@
   xmlns="urn:schemas-microsoft-com:asm.v1"
   manifestVersion="1.0">
 <assemblyIdentity
-    name="ReactOS.Application.Calculator"
+    name="Win32 Application.default.App"
     processorArchitecture="x86"
     version="1.0.0.0"
     type="win32"/>