reformat rc files to make them more readable AND comile with msvc

change CALLBACK to APIENTRY like in windows

svn path=/trunk/; revision=18594

diff --git a/reactos/lib/cpl/intl/Ja.rc b/reactos/lib/cpl/intl/Ja.rc
index 9d62a71..ee37bf5 100644 (file)
--- a/reactos/lib/cpl/intl/Ja.rc
+++ b/reactos/lib/cpl/intl/Ja.rc
@@ -44,7 +44,10 @@ BEGIN
   LTEXT "\8cß\8cã\82Ì\8bL\8d\86(&P):", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP
   COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
   GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE
-  LTEXT "\8e\9e\8d\8f\82Ì\8c`\8e®\82Ì\95\\\8bL\96@\n\nh = \8e\9e\8aÔ    m = \95ª    s = \95b    t = \8cß\91O\82Ü\82½\82Í\8cß\8cã\n\nh = 12 \8e\9e\8aÔ\nH = 24 \8e\9e\8aÔ\n\nhh, mm, ss = \90æ\93ª\82É\83[\83\8d\82 \82è\nh, m, s = \90æ\93ª\82É\83[\83\8d\82È\82µ", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP
+  LTEXT "\8e\9e\8d\8f\82Ì\8c`\8e®\82Ì\95\\\8bL\96@\n\n\
+  h = \8e\9e\8aÔ    m = \95ª    s = \95b    t = \8cß\91O\82Ü\82½\82Í\8cß\8cã\n\n\
+  h = 12 \8e\9e\8aÔ\nH = 24 \8e\9e\8aÔ\n\nhh, mm, ss = \90æ\93ª\82É\83[\83\8d\82 \82è\n\
+  h, m, s = \90æ\93ª\82É\83[\83\8d\82È\82µ", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP
 END
 
 

diff --git a/reactos/lib/cpl/intl/cz.rc b/reactos/lib/cpl/intl/cz.rc
index d8ef93d..eda2887 100644 (file)
--- a/reactos/lib/cpl/intl/cz.rc
+++ b/reactos/lib/cpl/intl/cz.rc
@@ -46,7 +46,11 @@ BEGIN
   LTEXT "Zkratka odpoledne:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP
   COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
   GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE
-  LTEXT "Zápis formátu èasu\n\nh = hodina    m = minuta    s = vteøina    t = dop. nebo odp.\n\nh = 12-ti hodinový cyklus\nH = 24-ti godinový cyklus\n\nhh, mm, ss = poèáteèní nula\nh, m, s = bez poèáteèní nuly", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP
+  LTEXT "Zápis formátu èasu\n\n\
+  h = hodina    m = minuta    s = vteøina    t = dop. nebo odp.\n\n\
+  h = 12-ti hodinový cyklus\nH = 24-ti godinový cyklus\n\n\
+  hh, mm, ss = poèáteèní nula\n\
+  h, m, s = bez poèáteèní nuly", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP
 END
 
 

diff --git a/reactos/lib/cpl/intl/de.rc b/reactos/lib/cpl/intl/de.rc
index 24f9f25..9abcb2a 100644 (file)
--- a/reactos/lib/cpl/intl/de.rc
+++ b/reactos/lib/cpl/intl/de.rc
@@ -46,7 +46,11 @@ BEGIN
   LTEXT "Symbol für &Nachmittag:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP\r
   COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP\r
   GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE\r
-  LTEXT "Zeitformat\n\nh = Stunde    m = Minute    s = Sekunde    t = Vor-/Nachmittag\n\nh = 12 Stunden\nH = 24 Stunden\n\nhh, mm, ss = führende Null\nh, m, s = keine führende Null", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP\r
+  LTEXT "Zeitformat\n\n\\r
+       h = Stunde    m = Minute    s = Sekunde    t = Vor-/Nachmittag\n\n\\r
+       h = 12 Stunden\nH = 24 Stunden\n\n\\r
+       hh, mm, ss = führende Null\n\\r
+       h, m, s = keine führende Null", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP\r
 END\r
 \r
 \r

diff --git a/reactos/lib/cpl/intl/en.rc b/reactos/lib/cpl/intl/en.rc
index 8bb1fe8..2ea6f39 100644 (file)
--- a/reactos/lib/cpl/intl/en.rc
+++ b/reactos/lib/cpl/intl/en.rc
@@ -46,7 +46,10 @@ BEGIN
   LTEXT "&PM symbol:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP\r
   COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP\r
   GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE\r
-  LTEXT "Time format notation\n\nh = hour    m = minute    s = second    t = am or pm\n\nh = 12 hour\nH = 24 hour\n\nhh, mm, ss = leading zero\nh, m, s = no leading zero", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP\r
+  LTEXT "Time format notation\n\n\\r
+       h = hour    m = minute    s = second    t = am or pm\n\nh = 12 hour\n\\r
+       H = 24 hour\n\nhh, mm, ss = leading zero\n\\r
+       h, m, s = no leading zero", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP\r
 END\r
 \r
 \r

diff --git a/reactos/lib/cpl/intl/intl.c b/reactos/lib/cpl/intl/intl.c
index c186077..4d1fb9e 100644 (file)
--- a/reactos/lib/cpl/intl/intl.c
+++ b/reactos/lib/cpl/intl/intl.c
@@ -91,7 +91,7 @@ Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam)
 
 
 /* Control Panel Callback */
-LONG CALLBACK
+LONG APIENTRY 
 CPlApplet(HWND hwndCpl,
          UINT uMsg,
          LPARAM lParam1,

diff --git a/reactos/lib/cpl/intl/nl.rc b/reactos/lib/cpl/intl/nl.rc
index 4f84628..16c03bc 100644 (file)
--- a/reactos/lib/cpl/intl/nl.rc
+++ b/reactos/lib/cpl/intl/nl.rc
@@ -46,7 +46,11 @@ BEGIN
   LTEXT "&PM-symbool:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP
   COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP
   GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE
-  LTEXT "Tijdsnotatie\n\nh = uur    m = minuut    s = second    t = am or pm\n\nh = 12 uur\nH = 24 uur\n\nhh, mm, ss = voorgaande nul\nh, m, s = zonder voorgaande nul", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP
+  LTEXT "Tijdsnotatie\n\n\
+  h = uur    m = minuut    s = second    t = am or pm\n\n\
+  h = 12 uur\nH = 24 uur\n\n\
+  hh, mm, ss = voorgaande nul\n\
+  h, m, s = zonder voorgaande nul", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP
 END