From 1c5f39473d504010bea90ea7929911fb0687face Mon Sep 17 00:00:00 2001
From: "ftang%netscape.com"
 <ftang%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 14 Feb 2001 14:08:18 +0000
Subject: [PATCH] check in the module change for smontagu@il.ibm.com
 r=yokoyama@netscape.com and ftang@netscape.com bug 62777

git-svn-id: svn://10.0.0.236/trunk@86995 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/intl/uconv/ucvibm/nsUCvIBMCID.h      | 14 ++++++++++++++
 mozilla/intl/uconv/ucvibm/nsUCvIBMModule.cpp | 19 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/mozilla/intl/uconv/ucvibm/nsUCvIBMCID.h b/mozilla/intl/uconv/ucvibm/nsUCvIBMCID.h
index 77a6070d7d2..4bdedc43ddd 100644
--- a/mozilla/intl/uconv/ucvibm/nsUCvIBMCID.h
+++ b/mozilla/intl/uconv/ucvibm/nsUCvIBMCID.h
@@ -122,5 +122,19 @@ NS_DECLARE_ID(kUnicodeToCP864CID,
   0x2d524fdb, 0xae74, 0x11d3, 0xab, 0xf7, 0x0, 0x4, 0xac, 0xee, 0xfa, 0x51);
 #define NS_UNICODETOCP864_CID \
   { 0x2d524fdb, 0xae74, 0x11d3, {0xab, 0xf7, 0x0, 0x4, 0xac, 0xee, 0xfa, 0x51}}
+  
+// Class ID for our CP864iToUnicode charset converter
+// {2D524FDC-AE74-11d3-ABF7-0004ACEEFA51}
+NS_DECLARE_ID(kCP864iToUnicodeCID,
+0x2d524fdc, 0xae74, 0x11d3, 0xab, 0xf7, 0x0, 0x4, 0xac, 0xee, 0xfa, 0x51);
+#define NS_CP864ITOUNICODE_CID \
+  { 0x2d524fdc, 0xae74, 0x11d3, {0xab, 0xf7, 0x0, 0x4, 0xac, 0xee, 0xfa, 0x51}}
+
+// Class ID for our UnicodeToCP864i charset converter
+// {2D524FDD-AE74-11d3-ABF7-0004ACEEFA51}
+NS_DECLARE_ID(kUnicodeToCP864iCID,
+0x2d524fdd, 0xae74, 0x11d3, 0xab, 0xf7, 0x0, 0x4, 0xac, 0xee, 0xfa, 0x51);
+#define NS_UNICODETOCP864I_CID \
+  { 0x2d524fdd, 0xae74, 0x11d3, {0xab, 0xf7, 0x0, 0x4, 0xac, 0xee, 0xfa, 0x51}}
 
 #endif /* nsUCvIBMCID_h___ */
diff --git a/mozilla/intl/uconv/ucvibm/nsUCvIBMModule.cpp b/mozilla/intl/uconv/ucvibm/nsUCvIBMModule.cpp
index c850a84349a..b4bf292ff74 100644
--- a/mozilla/intl/uconv/ucvibm/nsUCvIBMModule.cpp
+++ b/mozilla/intl/uconv/ucvibm/nsUCvIBMModule.cpp
@@ -55,13 +55,14 @@
 #include "nsCP857ToUnicode.h"
 #include "nsCP862ToUnicode.h"
 #include "nsCP864ToUnicode.h"
+#include "nsCP864iToUnicode.h"
 #include "nsUnicodeToCP850.h"
 #include "nsUnicodeToCP852.h"
 #include "nsUnicodeToCP855.h"
 #include "nsUnicodeToCP857.h"
 #include "nsUnicodeToCP862.h"
 #include "nsUnicodeToCP864.h"
-
+#include "nsUnicodeToCP864i.h"
 //----------------------------------------------------------------------------
 // Global functions and data [declaration]
 
@@ -81,12 +82,14 @@ NS_UCONV_REG_UNREG(nsCP855ToUnicode, "IBM855", "Unicode" , NS_CP855TOUNICODE_CID
 NS_UCONV_REG_UNREG(nsCP857ToUnicode, "IBM857", "Unicode" , NS_CP857TOUNICODE_CID);
 NS_UCONV_REG_UNREG(nsCP862ToUnicode, "IBM862", "Unicode" , NS_CP862TOUNICODE_CID);
 NS_UCONV_REG_UNREG(nsCP864ToUnicode, "IBM864", "Unicode" , NS_CP864TOUNICODE_CID);
+NS_UCONV_REG_UNREG(nsCP864iToUnicode,"IBM864i", "Unicode", NS_CP864ITOUNICODE_CID);
 NS_UCONV_REG_UNREG(nsUnicodeToCP850, "Unicode", "IBM850",  NS_UNICODETOCP850_CID);
 NS_UCONV_REG_UNREG(nsUnicodeToCP852, "Unicode", "IBM852",  NS_UNICODETOCP852_CID);
 NS_UCONV_REG_UNREG(nsUnicodeToCP855, "Unicode", "IBM855",  NS_UNICODETOCP855_CID);
 NS_UCONV_REG_UNREG(nsUnicodeToCP857, "Unicode", "IBM857",  NS_UNICODETOCP857_CID);
 NS_UCONV_REG_UNREG(nsUnicodeToCP862, "Unicode", "IBM862",  NS_UNICODETOCP862_CID);
 NS_UCONV_REG_UNREG(nsUnicodeToCP864, "Unicode", "IBM864",  NS_UNICODETOCP864_CID);
+NS_UCONV_REG_UNREG(nsUnicodeToCP864i,"Unicode", "IBM864i", NS_UNICODETOCP864I_CID);
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP850ToUnicode);
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP852ToUnicode);
@@ -94,12 +97,14 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP855ToUnicode);
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP857ToUnicode);
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP862ToUnicode);
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP864ToUnicode);
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP864iToUnicode);
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP850);
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP852);
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP855);
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP857);
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP862);
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP864);
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP864i);
 
 static nsModuleComponentInfo components[] = 
 {
@@ -139,6 +144,12 @@ static nsModuleComponentInfo components[] =
     nsCP864ToUnicodeConstructor ,
     nsCP864ToUnicodeRegSelf , nsCP864ToUnicodeUnRegSelf 
   },
+  { 
+    DECODER_NAME_BASE "IBM864i" , NS_CP864ITOUNICODE_CID, 
+    NS_UNICODEDECODER_CONTRACTID_BASE "IBM864i",
+    nsCP864iToUnicodeConstructor ,
+    nsCP864iToUnicodeRegSelf , nsCP864iToUnicodeUnRegSelf 
+  },
   { 
     ENCODER_NAME_BASE "IBM850" , NS_UNICODETOCP850_CID, 
     NS_UNICODEENCODER_CONTRACTID_BASE "IBM850",
@@ -174,6 +185,12 @@ static nsModuleComponentInfo components[] =
     NS_UNICODEENCODER_CONTRACTID_BASE "IBM864",
     nsUnicodeToCP864Constructor, 
     nsUnicodeToCP864RegSelf, nsUnicodeToCP864UnRegSelf
+  },
+  { 
+    ENCODER_NAME_BASE "IBM864i" , NS_UNICODETOCP864I_CID, 
+    NS_UNICODEENCODER_CONTRACTID_BASE "IBM864i",
+    nsUnicodeToCP864iConstructor, 
+    nsUnicodeToCP864iRegSelf, nsUnicodeToCP864iUnRegSelf
   }
 };