[RESOURCES] Remove redundant #pragma code_page(), includes, etc.

They are redundant when these are already present in the given module's root resource file, from which the language-specific resource files are being included.
HBelusca · Dec 22, 2024 · cc3672c · cc3672c
1 parent 40f3604
commit cc3672c
Show file tree

Hide file tree

Showing 362 changed files with 110 additions and 867 deletions.
diff --git a/base/applications/cmdutils/at/at.rc b/base/applications/cmdutils/at/at.rc
@@ -9,6 +9,7 @@
 
 /* UTF-8 */
 #pragma code_page(65001)
+
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"
 #endif

diff --git a/base/applications/cmdutils/fc/fc.rc b/base/applications/cmdutils/fc/fc.rc
@@ -6,7 +6,9 @@
 #define REACTOS_STR_ORIGINAL_FILENAME   "fc.exe"
 #include <reactos/version.rc>
 
-#pragma code_page(65001) /* UTF-8 */
+/* UTF-8 */
+#pragma code_page(65001)
+
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif

diff --git a/base/applications/cmdutils/find/find.rc b/base/applications/cmdutils/find/find.rc
@@ -9,6 +9,7 @@
 
 /* UTF-8 */
 #pragma code_page(65001)
+
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif

diff --git a/base/applications/cmdutils/help/help.rc b/base/applications/cmdutils/help/help.rc
@@ -12,6 +12,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* UTF-8 */
 #pragma code_page(65001)
+
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"
 #endif

diff --git a/base/applications/cmdutils/tasklist/tasklist.rc b/base/applications/cmdutils/tasklist/tasklist.rc
@@ -9,6 +9,7 @@
 
 /* UTF-8 */
 #pragma code_page(65001)
+
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif

diff --git a/base/applications/cmdutils/tree/tree.rc b/base/applications/cmdutils/tree/tree.rc
@@ -11,6 +11,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* UTF-8 */
 #pragma code_page(65001)
+
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"
 #endif

diff --git a/base/applications/cmdutils/where/where.rc b/base/applications/cmdutils/where/where.rc
@@ -6,7 +6,8 @@
 #define REACTOS_STR_ORIGINAL_FILENAME   "where.exe"
 #include <reactos/version.rc>
 
-#pragma code_page(65001) /* UTF-8 */
+/* UTF-8 */
+#pragma code_page(65001)
 
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"

diff --git a/base/applications/network/dwnl/dwnl.rc b/base/applications/network/dwnl/dwnl.rc
@@ -11,6 +11,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* UTF-8 */
 #pragma code_page(65001)
+
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"
 #endif

diff --git a/base/applications/network/tracert/tracert.rc b/base/applications/network/tracert/tracert.rc
@@ -7,7 +7,6 @@
 #define REACTOS_STR_ORIGINAL_COPYRIGHT "Ged Murphy ([email protected])"
 #include <reactos/version.rc>
 
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/base/applications/osk/osk.rc b/base/applications/osk/osk.rc
@@ -6,6 +6,7 @@
  */
 
 /* INCLUDES ******************************************************************/
+
 #include "precomp.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION  "ReactOS On Screen Keyboard"
@@ -17,7 +18,6 @@
 IDI_OSK             ICON "res/osk.ico"
 IDI_SOUNDCLICK      WAVE "res/click.wav"
 
-
 IDI_BACK      ICON "res/back.ico"
 IDI_TAB       ICON "res/tab.ico"
 IDI_CAPS_LOCK ICON "res/caps_lock.ico"
@@ -35,8 +35,9 @@ IDI_BOTTOM    ICON "res/bottom.ico"
 
 #include <reactos/manifest_exe.rc>
 
-// UTF-8
+/* UTF-8 */
 #pragma code_page(65001)
+
 #ifdef LANGUAGE_AR_DZ
     #include "lang/ar-DZ.rc"
 #endif
@@ -100,4 +101,5 @@ IDI_BOTTOM    ICON "res/bottom.ico"
 #ifdef LANGUAGE_ZH_TW
     #include "lang/zh-TW.rc"
 #endif
+
 /* EOF */
diff --git a/base/applications/regedit/clb/clb.rc b/base/applications/regedit/clb/clb.rc
@@ -12,7 +12,6 @@
 
 #include <reactos/manifest_dll.rc>
 
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/base/system/services/services.rc b/base/system/services/services.rc
@@ -8,7 +8,6 @@
 #define REACTOS_STR_ORIGINAL_FILENAME   "services.exe"
 #include <reactos/version.rc>
 
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/dll/cpl/console/console.rc b/dll/cpl/console/console.rc
@@ -12,6 +12,8 @@
 
 #include "resource.h"
 
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Control Panel Console Applet"
 #define REACTOS_STR_INTERNAL_NAME     "console"
@@ -22,8 +24,6 @@ IDC_CPLICON ICON "res/terminal.ico"
 
 #include <reactos/manifest_hosted.rc>
 
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/dll/cpl/inetcpl/inetcpl.rc b/dll/cpl/inetcpl/inetcpl.rc
@@ -21,7 +21,6 @@
 
 #include "inetcpl.h"
 
-
 #include <reactos/manifest_hosted.rc>
 
 /* UTF-8 */

diff --git a/dll/cpl/inetcpl/lang/He.rc b/dll/cpl/inetcpl/lang/He.rc
@@ -22,8 +22,6 @@
  *
  */
 
-#pragma code_page(65001)
-
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/dll/cpl/inetcpl/lang/Sr.rc b/dll/cpl/inetcpl/lang/Sr.rc
@@ -20,8 +20,6 @@
  *
  */
 
-#pragma code_page(65001)
-
 LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC
 
 STRINGTABLE

diff --git a/dll/cpl/inetcpl/lang/cs-CZ.rc b/dll/cpl/inetcpl/lang/cs-CZ.rc
@@ -3,9 +3,6 @@
  * UPDATED:    2014-04-21
  */
 
- /* UTF-8 */
- #pragma code_page(65001)
-
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/dll/cpl/inetcpl/lang/de-DE.rc b/dll/cpl/inetcpl/lang/de-DE.rc
@@ -19,8 +19,6 @@
  *
  */
 
-#pragma code_page(65001)
-
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/dll/cpl/inetcpl/lang/fr-FR.rc b/dll/cpl/inetcpl/lang/fr-FR.rc
@@ -20,9 +20,6 @@
  *
  */
 
-/* UTF-8 */
-#pragma code_page(65001)
-
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/dll/cpl/inetcpl/lang/it-IT.rc b/dll/cpl/inetcpl/lang/it-IT.rc
@@ -19,9 +19,6 @@
  *
  */
 
-/* UTF-8 */
-#pragma code_page(65001)
-
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/dll/cpl/inetcpl/lang/ja-JP.rc b/dll/cpl/inetcpl/lang/ja-JP.rc
@@ -20,9 +20,6 @@
  *
  */
 
-/* UTF-8 */
-#pragma code_page(65001)
-
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/dll/cpl/inetcpl/lang/ko-KR.rc b/dll/cpl/inetcpl/lang/ko-KR.rc
@@ -20,8 +20,6 @@
  *
  */
 
-#pragma code_page(65001)
-
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/dll/cpl/inetcpl/lang/lt-LT.rc b/dll/cpl/inetcpl/lang/lt-LT.rc
@@ -19,9 +19,6 @@
  *
  */
 
-/* UTF-8 */
-#pragma code_page(65001)
-
 LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/dll/cpl/inetcpl/lang/pl-PL.rc b/dll/cpl/inetcpl/lang/pl-PL.rc
@@ -19,9 +19,6 @@
  *
  */
 
-/* UTF-8 */
-#pragma code_page(65001)
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/dll/cpl/inetcpl/lang/pt-BR.rc b/dll/cpl/inetcpl/lang/pt-BR.rc
@@ -19,8 +19,6 @@
  *
  */
 
-#pragma code_page(65001)
-
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 STRINGTABLE

diff --git a/dll/cpl/inetcpl/lang/pt-PT.rc b/dll/cpl/inetcpl/lang/pt-PT.rc
@@ -20,9 +20,6 @@
  *
  */
 
-/* UTF-8 */
-#pragma code_page(65001)
-
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/dll/cpl/inetcpl/lang/ru-RU.rc b/dll/cpl/inetcpl/lang/ru-RU.rc
@@ -19,9 +19,6 @@
  *
  */
 
-/* UTF-8 */
-#pragma code_page(65001)
-
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/dll/cpl/inetcpl/lang/sv-SE.rc b/dll/cpl/inetcpl/lang/sv-SE.rc
@@ -19,8 +19,6 @@
  *
  */
 
-#pragma code_page(65001)
-
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/dll/cpl/inetcpl/lang/tr-TR.rc b/dll/cpl/inetcpl/lang/tr-TR.rc
@@ -19,9 +19,6 @@
  *
  */
 
-/* UTF-8 */
-#pragma code_page(65001)
-
 LANGUAGE LANG_TURKISH, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/dll/cpl/inetcpl/lang/uk-UA.rc b/dll/cpl/inetcpl/lang/uk-UA.rc
@@ -20,9 +20,6 @@
  *
  */
 
-/* UTF-8 */
-#pragma code_page(65001)
-
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/dll/shellext/mydocs/mydocs.rc b/dll/shellext/mydocs/mydocs.rc
@@ -9,18 +9,18 @@
 #include <winuser.h>
 #include "resource.h"
 
-#include "mydocs_version.rc"
-
-/* UTF-8 */
-#pragma code_page(65001)
-
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
+#include "mydocs_version.rc"
+
 100 ICON "../../win32/shell32/res/icons/235.ico" // IDI_SHELL_MY_DOCUMENTS
 101 ICON "../../win32/shell32/res/icons/236.ico" // IDI_SHELL_MY_PICTURES
 
 IDR_MYDOCS REGISTRY "res/mydocs.rgs"
 
+/* UTF-8 */
+#pragma code_page(65001)
+
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"
 #endif

diff --git a/dll/shellext/sendmail/sendmail.rc b/dll/shellext/sendmail/sendmail.rc
@@ -9,15 +9,15 @@
 #include <winuser.h>
 #include "resource.h"
 
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
 #include "sendmail_version.rc"
 
+IDR_DESKLINK REGISTRY "res/desklink.rgs"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-IDR_DESKLINK REGISTRY "res/desklink.rgs"
-
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"
 #endif

diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/zipfldr.rc
@@ -22,7 +22,6 @@ IDR_ZIPFLDR REGISTRY "res/zipfldr.rgs"
 /* UTF-8 */
 #pragma code_page(65001)
 
-
 #ifdef LANGUAGE_DE_DE
     #include "lang/de-DE.rc"
 #endif

diff --git a/dll/win32/comdlg32/rsrc.rc b/dll/win32/comdlg32/rsrc.rc
@@ -42,7 +42,8 @@
  * get localized bitmaps for example.
  */
 
-#pragma code_page(65001) // UTF-8
+/* UTF-8 */
+#pragma code_page(65001)
 
 #ifdef LANGUAGE_BG_BG
     #include "lang/cdlg_Bg.rc"

diff --git a/dll/win32/credui/lang/credui_Da.rc b/dll/win32/credui/lang/credui_Da.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#pragma code_page(65001)
-
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/dll/win32/credui/lang/credui_De.rc b/dll/win32/credui/lang/credui_De.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#pragma code_page(65001)
-
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/dll/win32/credui/lang/credui_Es.rc b/dll/win32/credui/lang/credui_Es.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#pragma code_page(65001)
-
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 STRINGTABLE
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,7 +12,6 @@

		#include <reactos/manifest_dll.rc>


		/* UTF-8 */
		#pragma code_page(65001)

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,7 +21,6 @@

		#include "inetcpl.h"


		#include <reactos/manifest_hosted.rc>

		/* UTF-8 */
Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,8 +22,6 @@ @@
      *
      */
-    #pragma code_page(65001)
     LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
     STRINGTABLE
@@ Expand Down @@