Write to the Windows eventlog in UTF16, converting the message encoding

as necessary.

Itagaki Takahiro with some changes from me

2 files changed, 113 insertions, 128 deletions

diff --git a/src/backend/utils/mb/encnames.c b/src/backend/utils/mb/encnames.c
index def8c84bad1..04df4cb5af6 100644
--- a/src/backend/utils/mb/encnames.c
+++ b/src/backend/utils/mb/encnames.c
@@ -2,7 +2,7 @@
  * Encoding names and routines for work with it. All
  * in this file is shared bedween FE and BE.
  *
- * $PostgreSQL: pgsql/src/backend/utils/mb/encnames.c,v 1.39 2009/04/24 08:43:50 mha Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/mb/encnames.c,v 1.40 2009/10/17 00:24:51 mha Exp $
  */
 #ifdef FRONTEND
 #include "postgres_fe.h"
@@ -300,134 +300,55 @@ sizeof(pg_encname_tbl) / sizeof(pg_encname_tbl[0]) - 1;
  * XXX must be sorted by the same order as enum pg_enc (in mb/pg_wchar.h)
  * ----------
  */
+#ifndef WIN32
+#define DEF_ENC2NAME(name, codepage) { #name, PG_##name }
+#else
+#define DEF_ENC2NAME(name, codepage) { #name, PG_##name, codepage }
+#endif
 pg_enc2name pg_enc2name_tbl[] =
 {
-	{
-		"SQL_ASCII", PG_SQL_ASCII
-	},
-	{
-		"EUC_JP", PG_EUC_JP
-	},
-	{
-		"EUC_CN", PG_EUC_CN
-	},
-	{
-		"EUC_KR", PG_EUC_KR
-	},
-	{
-		"EUC_TW", PG_EUC_TW
-	},
-	{
-		"EUC_JIS_2004", PG_EUC_JIS_2004
-	},
-	{
-		"UTF8", PG_UTF8
-	},
-	{
-		"MULE_INTERNAL", PG_MULE_INTERNAL
-	},
-	{
-		"LATIN1", PG_LATIN1
-	},
-	{
-		"LATIN2", PG_LATIN2
-	},
-	{
-		"LATIN3", PG_LATIN3
-	},
-	{
-		"LATIN4", PG_LATIN4
-	},
-	{
-		"LATIN5", PG_LATIN5
-	},
-	{
-		"LATIN6", PG_LATIN6
-	},
-	{
-		"LATIN7", PG_LATIN7
-	},
-	{
-		"LATIN8", PG_LATIN8
-	},
-	{
-		"LATIN9", PG_LATIN9
-	},
-	{
-		"LATIN10", PG_LATIN10
-	},
-	{
-		"WIN1256", PG_WIN1256
-	},
-	{
-		"WIN1258", PG_WIN1258
-	},
-	{
-		"WIN866", PG_WIN866
-	},
-	{
-		"WIN874", PG_WIN874
-	},
-	{
-		"KOI8R", PG_KOI8R
-	},
-	{
-		"WIN1251", PG_WIN1251
-	},
-	{
-		"WIN1252", PG_WIN1252
-	},
-	{
-		"ISO_8859_5", PG_ISO_8859_5
-	},
-	{
-		"ISO_8859_6", PG_ISO_8859_6
-	},
-	{
-		"ISO_8859_7", PG_ISO_8859_7
-	},
-	{
-		"ISO_8859_8", PG_ISO_8859_8
-	},
-	{
-		"WIN1250", PG_WIN1250
-	},
-	{
-		"WIN1253", PG_WIN1253
-	},
-	{
-		"WIN1254", PG_WIN1254
-	},
-	{
-		"WIN1255", PG_WIN1255
-	},
-	{
-		"WIN1257", PG_WIN1257
-	},
-	{
-		"KOI8U", PG_KOI8U
-	},
-	{
-		"SJIS", PG_SJIS
-	},
-	{
-		"BIG5", PG_BIG5
-	},
-	{
-		"GBK", PG_GBK
-	},
-	{
-		"UHC", PG_UHC
-	},
-	{
-		"GB18030", PG_GB18030
-	},
-	{
-		"JOHAB", PG_JOHAB
-	},
-	{
-		"SHIFT_JIS_2004", PG_SHIFT_JIS_2004
-	}
+	DEF_ENC2NAME(SQL_ASCII, 0),
+	DEF_ENC2NAME(EUC_JP, 20932),
+	DEF_ENC2NAME(EUC_CN, 20936),
+	DEF_ENC2NAME(EUC_KR, 51949),
+	DEF_ENC2NAME(EUC_TW, 0),
+	DEF_ENC2NAME(EUC_JIS_2004, 20932),
+	DEF_ENC2NAME(UTF8, 65001),
+	DEF_ENC2NAME(MULE_INTERNAL, 0),
+	DEF_ENC2NAME(LATIN1, 28591),
+	DEF_ENC2NAME(LATIN2, 28592),
+	DEF_ENC2NAME(LATIN3, 28593),
+	DEF_ENC2NAME(LATIN4, 28594),
+	DEF_ENC2NAME(LATIN5, 28599),
+	DEF_ENC2NAME(LATIN6, 0),
+	DEF_ENC2NAME(LATIN7, 0),
+	DEF_ENC2NAME(LATIN8, 0),
+	DEF_ENC2NAME(LATIN9, 28605),
+	DEF_ENC2NAME(LATIN10, 0),
+	DEF_ENC2NAME(WIN1256, 1256),
+	DEF_ENC2NAME(WIN1258, 1258),
+	DEF_ENC2NAME(WIN866, 866),
+	DEF_ENC2NAME(WIN874, 874),
+	DEF_ENC2NAME(KOI8R, 20866),
+	DEF_ENC2NAME(WIN1251, 1251),
+	DEF_ENC2NAME(WIN1252, 1252),
+	DEF_ENC2NAME(ISO_8859_5, 28595),
+	DEF_ENC2NAME(ISO_8859_6, 28596),
+	DEF_ENC2NAME(ISO_8859_7, 28597),
+	DEF_ENC2NAME(ISO_8859_8, 28598),
+	DEF_ENC2NAME(WIN1250, 1250),
+	DEF_ENC2NAME(WIN1253, 1253),
+	DEF_ENC2NAME(WIN1254, 1254),
+	DEF_ENC2NAME(WIN1255, 1255),
+	DEF_ENC2NAME(WIN1257, 1257),
+	DEF_ENC2NAME(KOI8U, 21866),
+	DEF_ENC2NAME(SJIS, 932),
+	DEF_ENC2NAME(BIG5, 950),
+	DEF_ENC2NAME(GBK, 936),
+	DEF_ENC2NAME(UHC, 0),
+	DEF_ENC2NAME(GB18030, 54936),
+	DEF_ENC2NAME(JOHAB, 0),
+	DEF_ENC2NAME(SHIFT_JIS_2004, 932)
 };
 
 /* ----------
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index cd3ebb219e2..c6e32ef6643 100644
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -4,7 +4,7 @@
  *
  * Tatsuo Ishii
  *
- * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.89 2009/07/07 19:28:56 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.90 2009/10/17 00:24:51 mha Exp $
  */
 #include "postgres.h"
 
@@ -58,6 +58,7 @@ static FmgrInfo *ToClientConvProc = NULL;
  */
 static pg_enc2name *ClientEncoding = &pg_enc2name_tbl[PG_SQL_ASCII];
 static pg_enc2name *DatabaseEncoding = &pg_enc2name_tbl[PG_SQL_ASCII];
+static pg_enc2name *PlatformEncoding = NULL;
 
 /*
  * During backend startup we can't set client encoding because we (a)
@@ -978,3 +979,66 @@ pg_client_encoding(PG_FUNCTION_ARGS)
 	Assert(ClientEncoding);
 	return DirectFunctionCall1(namein, CStringGetDatum(ClientEncoding->name));
 }
+
+int
+GetPlatformEncoding(void)
+{
+	if (PlatformEncoding == NULL)
+		PlatformEncoding = &pg_enc2name_tbl[pg_get_encoding_from_locale("")];
+	return PlatformEncoding->encoding;
+}
+
+#ifdef WIN32
+
+/*
+ * Result is palloc'ed null-terminated utf16 string. The character length
+ * is also passed to utf16len if not null. Returns NULL iff failed.
+ */
+WCHAR *
+pgwin32_toUTF16(const char *str, int len, int *utf16len)
+{
+	WCHAR	   *utf16;
+	int			dstlen;
+	UINT		codepage;
+
+	codepage = pg_enc2name_tbl[GetDatabaseEncoding()].codepage;
+
+	/*
+	 * Use MultiByteToWideChar directly if there is a corresponding codepage,
+	 * or double conversion through UTF8 if not.
+	 */
+	if (codepage != 0)
+	{
+		utf16 = (WCHAR *) palloc(sizeof(WCHAR) * (len + 1));
+		dstlen = MultiByteToWideChar(codepage, 0, str, len, utf16, len);
+		utf16[dstlen] = L'\0';
+	}
+	else
+	{
+		char	   *utf8;
+
+		utf8 = (char *) pg_do_encoding_conversion((unsigned char *) str,
+										len, GetDatabaseEncoding(), PG_UTF8);
+		if (utf8 != str)
+			len = strlen(utf8);
+
+		utf16 = (WCHAR *) palloc(sizeof(WCHAR) * (len + 1));
+		dstlen = MultiByteToWideChar(CP_UTF8, 0, utf8, len, utf16, len);
+		utf16[dstlen] = L'\0';
+
+		if (utf8 != str)
+			pfree(utf8);
+	}
+
+	if (dstlen == 0 && len > 0)
+	{
+		pfree(utf16);
+		return NULL;	/* error */
+	}
+
+	if (utf16len)
+		*utf16len = len;
+	return utf16;
+}
+
+#endif