From cdb62c624459c5b75e39436bd27701737418a70a Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 13 Oct 2013 23:12:09 +0000
Subject: [PATCH] * Addendum to r60650. CORE-7471 #resolve

svn path=/trunk/; revision=60653
---
 rostests/dibtests/alphablend/alphablend.rc   |  4 ++--
 rostests/dibtests/bitblt/bitblt.rc           |  3 +--
 rostests/dibtests/icontest/icontest.rc       |  2 +-
 rostests/kmtests/kmtest/kmtest.rc            |  2 +-
 rostests/tests/carets/carets.rc              |  2 +-
 rostests/tests/dirdlg/dirdlg.rc              |  2 +-
 rostests/tests/mdi/mdi.rc                    |  2 +-
 rostests/tests/miditest/miditest.rc          |  2 +-
 rostests/tests/popupmenu/popupmenu.rc        |  2 +-
 rostests/win32/user32/kbdlayout/kbdlayout.rc | 10 +++++-----
 10 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/rostests/dibtests/alphablend/alphablend.rc b/rostests/dibtests/alphablend/alphablend.rc
index b51fd156496..2e0279c62cb 100644
--- a/rostests/dibtests/alphablend/alphablend.rc
+++ b/rostests/dibtests/alphablend/alphablend.rc
@@ -1,3 +1,3 @@
 
-1000            BITMAP  MOVEABLE PURE   "lena.bmp"
-2000		BITMAP	MOVEABLE PURE	"lenaalpha.bmp"
+1000            BITMAP "lena.bmp"
+2000		BITMAP "lenaalpha.bmp"
diff --git a/rostests/dibtests/bitblt/bitblt.rc b/rostests/dibtests/bitblt/bitblt.rc
index 25d17abdb36..39e52408753 100644
--- a/rostests/dibtests/bitblt/bitblt.rc
+++ b/rostests/dibtests/bitblt/bitblt.rc
@@ -1,2 +1 @@
-1000            BITMAP  MOVEABLE PURE   "lena.bmp"
-
+1000            BITMAP "lena.bmp"
diff --git a/rostests/dibtests/icontest/icontest.rc b/rostests/dibtests/icontest/icontest.rc
index 68c787a9de3..a1460043a97 100644
--- a/rostests/dibtests/icontest/icontest.rc
+++ b/rostests/dibtests/icontest/icontest.rc
@@ -1,4 +1,4 @@
 #include <windows.h>
 #include "resource.h"
 
-IDI_ICON                ICON    DISCARDABLE     "icon.ico"
+IDI_ICON                ICON         "icon.ico"
diff --git a/rostests/kmtests/kmtest/kmtest.rc b/rostests/kmtests/kmtest/kmtest.rc
index a47caa7271c..667509b4679 100644
--- a/rostests/kmtests/kmtest/kmtest.rc
+++ b/rostests/kmtests/kmtest/kmtest.rc
@@ -12,4 +12,4 @@
 #define REACTOS_STR_ORIGINAL_FILENAME   "kmtest.exe\0"
 #include <reactos/version.rc>
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST DISCARDABLE PURE "kmtest/kmtest.exe.manifest"
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "kmtest/kmtest.exe.manifest"
diff --git a/rostests/tests/carets/carets.rc b/rostests/tests/carets/carets.rc
index b269d709790..3752594c227 100644
--- a/rostests/tests/carets/carets.rc
+++ b/rostests/tests/carets/carets.rc
@@ -1,3 +1,3 @@
 #include <windows.h>
 
-1 BITMAP  DISCARDABLE "caret.bmp"
+1 BITMAP   "caret.bmp"
diff --git a/rostests/tests/dirdlg/dirdlg.rc b/rostests/tests/dirdlg/dirdlg.rc
index bd48b635794..8fc8d7853ea 100644
--- a/rostests/tests/dirdlg/dirdlg.rc
+++ b/rostests/tests/dirdlg/dirdlg.rc
@@ -1,7 +1,7 @@
 #include <windows.h>
 #include "resource.h"
 
-IDD_MAIN DIALOG DISCARDABLE 20, 20, 220, 140
+IDD_MAIN DIALOG 20, 20, 220, 140
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Sans Serif"
 CAPTION "Select a file"
diff --git a/rostests/tests/mdi/mdi.rc b/rostests/tests/mdi/mdi.rc
index fa5b4a5416b..bca5647fe35 100644
--- a/rostests/tests/mdi/mdi.rc
+++ b/rostests/tests/mdi/mdi.rc
@@ -1,7 +1,7 @@
 #include <windows.h>
 #include "resource.h"
 
-IDR_MAINMENU MENU DISCARDABLE
+IDR_MAINMENU MENU
 BEGIN
     POPUP "&File"
     BEGIN
diff --git a/rostests/tests/miditest/miditest.rc b/rostests/tests/miditest/miditest.rc
index 5174d310d99..9deba26b0b2 100644
--- a/rostests/tests/miditest/miditest.rc
+++ b/rostests/tests/miditest/miditest.rc
@@ -1,6 +1,6 @@
 #include <windows.h>
 
-IDR_MAINMENU MENU DISCARDABLE
+IDR_MAINMENU MENU
 BEGIN
     POPUP "&File"
     BEGIN
diff --git a/rostests/tests/popupmenu/popupmenu.rc b/rostests/tests/popupmenu/popupmenu.rc
index 75256967add..6a7f0ba8b8e 100644
--- a/rostests/tests/popupmenu/popupmenu.rc
+++ b/rostests/tests/popupmenu/popupmenu.rc
@@ -1,7 +1,7 @@
 #include <windows.h>
 #include "resource.h"
 
-IDM_MAINMENU MENU LOADONCALL MOVEABLE DISCARDABLE
+IDM_MAINMENU MENU
 {
   POPUP "&File"
   {
diff --git a/rostests/win32/user32/kbdlayout/kbdlayout.rc b/rostests/win32/user32/kbdlayout/kbdlayout.rc
index 41eb31be514..ef10d4204ec 100644
--- a/rostests/win32/user32/kbdlayout/kbdlayout.rc
+++ b/rostests/win32/user32/kbdlayout/kbdlayout.rc
@@ -26,7 +26,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 // Dialog
 //
 
-IDD_MAINDIALOG DIALOG DISCARDABLE  0, 0, 327, 194
+IDD_MAINDIALOG DIALOG 0, 0, 327, 194
 STYLE DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU
 CAPTION "Keyboard layout test"
 FONT 8, "MS Sans Serif"
@@ -87,7 +87,7 @@ END
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_MAINDIALOG, DIALOG
     BEGIN
@@ -106,18 +106,18 @@ END
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE DISCARDABLE
+1 TEXTINCLUDE
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE
+2 TEXTINCLUDE
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE
+3 TEXTINCLUDE
 BEGIN
     "\r\n"
     "\0"