[CMAKE]

* Partially revert r50224 as the current resource handling doesn't suffer from the iconv issue on unix.

svn path=/branches/cmake-bringup/; revision=51703

diff --git a/base/applications/calc/resource.rc b/base/applications/calc/resource.rc
index 88209d3..fa35d39 100644 (file)
--- a/base/applications/calc/resource.rc
+++ b/base/applications/calc/resource.rc
@@ -52,7 +52,7 @@ IDB_BITMAP_ROS          BITMAP  DISCARDABLE     "res/ROS_logo.bmp"
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/ko-KR.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/ko-KR.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"

diff --git a/base/applications/dxdiag/rsrc.rc b/base/applications/dxdiag/rsrc.rc
index d2a28b4..b0539e3 100644 (file)
--- a/base/applications/dxdiag/rsrc.rc
+++ b/base/applications/dxdiag/rsrc.rc
@@ -10,7 +10,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "lang/en-US.rc"
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/en-US.rc"
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/ko-KR.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/ko-KR.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"

diff --git a/base/applications/mplay32/rsrc.rc b/base/applications/mplay32/rsrc.rc
index 5ea9624..0b15dfb 100644 (file)
--- a/base/applications/mplay32/rsrc.rc
+++ b/base/applications/mplay32/rsrc.rc
@@ -8,7 +8,7 @@
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"

-// #include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"

diff --git a/base/applications/mscutils/devmgmt/rsrc.rc b/base/applications/mscutils/devmgmt/rsrc.rc
index 5a099c3..8a264bd 100644 (file)
--- a/base/applications/mscutils/devmgmt/rsrc.rc
+++ b/base/applications/mscutils/devmgmt/rsrc.rc
@@ -20,7 +20,7 @@ IDB_EXIT    BITMAP DISCARDABLE "res/exit.bmp"
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/ko-KR.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ko-KR.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"


@@ -30,4 +30,3 @@ IDB_EXIT    BITMAP DISCARDABLE "res/exit.bmp"
 #include "lang/sv-SE.rc"
 #include "lang/th-TH.rc"
 #include "lang/uk-UA.rc"
 #include "lang/sv-SE.rc"
 #include "lang/th-TH.rc"
 #include "lang/uk-UA.rc"

-

diff --git a/base/applications/mscutils/eventvwr/rsrc.rc b/base/applications/mscutils/eventvwr/rsrc.rc
index 43d786e..a3b864e 100644 (file)
--- a/base/applications/mscutils/eventvwr/rsrc.rc
+++ b/base/applications/mscutils/eventvwr/rsrc.rc
@@ -16,10 +16,10 @@ IDI_ERRORICON           ICON  "res/error.ico"
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/ko-KR.rc"
 #include "lang/no-NO.rc"
 #include "lang/ko-KR.rc"
 #include "lang/no-NO.rc"

-//#include "lang/pl-PL.rc" FIXME: iconv issue
+#include "lang/pl-PL.rc"

 #include "lang/ro-RO.rc"
 #include "lang/ru-RU.rc"
 #include "lang/sk-SK.rc"
 #include "lang/ro-RO.rc"
 #include "lang/ru-RU.rc"
 #include "lang/sk-SK.rc"

diff --git a/base/applications/mscutils/servman/rsrc.rc b/base/applications/mscutils/servman/rsrc.rc
index 21dafd6..2b1aed5 100644 (file)
--- a/base/applications/mscutils/servman/rsrc.rc
+++ b/base/applications/mscutils/servman/rsrc.rc
@@ -28,7 +28,7 @@ IDI_DRIVER      ICON "res/driver.ico"
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/ko-KR.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ko-KR.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"

diff --git a/base/applications/mstsc/rsrc.rc b/base/applications/mstsc/rsrc.rc
index e37fd29..d933a50 100644 (file)
--- a/base/applications/mstsc/rsrc.rc
+++ b/base/applications/mstsc/rsrc.rc
@@ -20,7 +20,7 @@ IDB_SPECT   BITMAP "res/spectrum.bmp"
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/ko-KR.rc"
 #include "lang/lt-LT.rc"
 #include "lang/no-NO.rc"
 #include "lang/ko-KR.rc"
 #include "lang/lt-LT.rc"
 #include "lang/no-NO.rc"

diff --git a/base/applications/notepad/rsrc.rc b/base/applications/notepad/rsrc.rc
index 535a52c..d33e548 100644 (file)
--- a/base/applications/notepad/rsrc.rc
+++ b/base/applications/notepad/rsrc.rc
@@ -48,7 +48,7 @@ IDI_NPICON ICON "res/notepad.ico"
 #include "lang/hy-AM.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
 #include "lang/hy-AM.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/lt-LT.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/lt-LT.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"

diff --git a/base/applications/rapps/rsrc.rc b/base/applications/rapps/rsrc.rc
index ad83eca..c766ea7 100644 (file)
--- a/base/applications/rapps/rsrc.rc
+++ b/base/applications/rapps/rsrc.rc
@@ -5,7 +5,7 @@
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"

diff --git a/base/applications/regedit/rsrc.rc b/base/applications/regedit/rsrc.rc
index 79db6af..ae770b5 100644 (file)
--- a/base/applications/regedit/rsrc.rc
+++ b/base/applications/regedit/rsrc.rc
@@ -38,7 +38,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/ko-KR.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/ko-KR.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"

diff --git a/base/applications/screensavers/logon/logon.rc b/base/applications/screensavers/logon/logon.rc
index 6392735..088e5da 100644 (file)
--- a/base/applications/screensavers/logon/logon.rc
+++ b/base/applications/screensavers/logon/logon.rc
@@ -20,7 +20,7 @@ IDB_SERVER    BITMAP DISCARDABLE      "res/1.bmp"
 #include "lang/es-ES.rc"
 #include "lang/eu-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/es-ES.rc"
 #include "lang/eu-ES.rc"
 #include "lang/fr-FR.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/ko-KR.rc"
 #include "lang/lt-LT.rc"
 #include "lang/nl-NL.rc"
 #include "lang/ko-KR.rc"
 #include "lang/lt-LT.rc"
 #include "lang/nl-NL.rc"

diff --git a/base/setup/vmwinst/rsrc.rc b/base/setup/vmwinst/rsrc.rc
index 11cb5ba..65ee2b8 100644 (file)
--- a/base/setup/vmwinst/rsrc.rc
+++ b/base/setup/vmwinst/rsrc.rc
@@ -23,7 +23,7 @@ IDB_HEADER    BITMAP "resources/header.bmp"
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/lt-LT.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/lt-LT.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"

diff --git a/base/setup/welcome/rsrc.rc b/base/setup/welcome/rsrc.rc
index 89d1c12..a05f295 100644 (file)
--- a/base/setup/welcome/rsrc.rc
+++ b/base/setup/welcome/rsrc.rc
@@ -51,7 +51,7 @@ END
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/lt-LT.rc"
 #include "lang/no-NO.rc"
 #include "lang/nl-NL.rc"
 #include "lang/lt-LT.rc"
 #include "lang/no-NO.rc"
 #include "lang/nl-NL.rc"

diff --git a/base/system/winlogon/rsrc.rc b/base/system/winlogon/rsrc.rc
index fdfc56d..a0215de 100644 (file)
--- a/base/system/winlogon/rsrc.rc
+++ b/base/system/winlogon/rsrc.rc
@@ -15,7 +15,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/lt-LT.rc"
 #include "lang/no-NO.rc"
 #include "lang/nl-NL.rc"
 #include "lang/lt-LT.rc"
 #include "lang/no-NO.rc"
 #include "lang/nl-NL.rc"

diff --git a/dll/cpl/desk/rsrc.rc b/dll/cpl/desk/rsrc.rc
index 54e3dd1..c27b561 100644 (file)
--- a/dll/cpl/desk/rsrc.rc
+++ b/dll/cpl/desk/rsrc.rc
@@ -11,7 +11,7 @@
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"

diff --git a/dll/cpl/powercfg/rsrc.rc b/dll/cpl/powercfg/rsrc.rc
index c3af70a..f9e7669 100644 (file)
--- a/dll/cpl/powercfg/rsrc.rc
+++ b/dll/cpl/powercfg/rsrc.rc
@@ -10,7 +10,7 @@
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"

diff --git a/dll/cpl/sysdm/rsrc.rc b/dll/cpl/sysdm/rsrc.rc
index a5f97a8..ee3e6ff 100644 (file)
--- a/dll/cpl/sysdm/rsrc.rc
+++ b/dll/cpl/sysdm/rsrc.rc
@@ -10,7 +10,7 @@
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ro-RO.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ro-RO.rc"

diff --git a/dll/win32/netid/rsrc.rc b/dll/win32/netid/rsrc.rc
index 5bcd0e1..0d8989e 100644 (file)
--- a/dll/win32/netid/rsrc.rc
+++ b/dll/win32/netid/rsrc.rc
@@ -9,7 +9,7 @@
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/it-IT.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/it-IT.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"

diff --git a/dll/win32/netshell/netshell.rc b/dll/win32/netshell/netshell.rc
index d094866..47f67ab 100644 (file)
--- a/dll/win32/netshell/netshell.rc
+++ b/dll/win32/netshell/netshell.rc
@@ -33,7 +33,7 @@ IDI_NET_TRANSREC            ICON "res/nettrrec.ico"
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"

diff --git a/dll/win32/shell32/shell32.rc b/dll/win32/shell32/shell32.rc
index 825f7e1..1a93be1 100644 (file)
--- a/dll/win32/shell32/shell32.rc
+++ b/dll/win32/shell32/shell32.rc
@@ -60,7 +60,7 @@ END
 #include "lang/fr-FR.rc"
 #include "lang/hu-HU.rc"
 #include "lang/it-IT.rc"
 #include "lang/fr-FR.rc"
 #include "lang/hu-HU.rc"
 #include "lang/it-IT.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/ko-KR.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/ko-KR.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"

diff --git a/dll/win32/syssetup/syssetup.rc b/dll/win32/syssetup/syssetup.rc
index bf10ebe..d13f09b 100644 (file)
--- a/dll/win32/syssetup/syssetup.rc
+++ b/dll/win32/syssetup/syssetup.rc
@@ -63,7 +63,7 @@ IDR_GPL RT_TEXT "COPYING"
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/no-NO.rc"
 #include "lang/nl-NL.rc"
 #include "lang/pl-PL.rc"
 #include "lang/no-NO.rc"
 #include "lang/nl-NL.rc"
 #include "lang/pl-PL.rc"

diff --git a/subsystems/win32/csrss/win32csr/rsrc.rc b/subsystems/win32/csrss/win32csr/rsrc.rc
index 32fe83a..bf2ce40 100644 (file)
--- a/subsystems/win32/csrss/win32csr/rsrc.rc
+++ b/subsystems/win32/csrss/win32csr/rsrc.rc
@@ -13,7 +13,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"

-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"

 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"