Commit1e22e60

committed

Patch of Win32 Encoding problem for server messages using

FormatMessage() (This should have been in 8.2.0, patched to 8.2.X andHEAD):I think this problem to be complex....http://archives.postgresql.org/pgsql-hackers/2006-11/msg00042.phpFormatMessage of windows cannot consider the encoding of the database.However, I should try the solution now. It is necessary to clear theproblem.Multi character-code exists together in message and log. It doesn'tconsiderthe data base encoding that the user intended....The user in multi-byte country can try this.http://inet.winpg.jp/~saito/pg_bug/MessageCheck.cThat is, it is likely to become it in this manner.(Japanese)http://inet.winpg.jp/~saito/pg_bug/FormatMessage998.pngHiroshi Saito

1 parent6cd9a58 commit1e22e60Copy full SHA for 1e22e60

File tree

-7

lines changed

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/backend/port/dynloader/win32.c,v 1.8 2006/06/07 22:24:43 momjian Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/backend/port/dynloader/win32.c,v 1.9 2006/12/04 22:23:40 momjian Exp $ */`
`2`	`2`
`3`	`3`	`#include"postgres.h"`
`4`	`4`
`@@ -18,7 +18,7 @@ set_dl_error(void)`
`18`	`18`	`FORMAT_MESSAGE_FROM_SYSTEM,`
`19`	`19`	`NULL,`
`20`	`20`	`err,`
`21`		`-MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),`
	`21`	`+MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT),`
`22`	`22`	`last_dyn_error,`
`23`	`23`	`sizeof(last_dyn_error)-1,`
`24`	`24`	`NULL)==0)`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $PostgreSQL: pgsql/src/backend/port/win32/socket.c,v 1.14 2006/10/13 13:59:47 teodor Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/backend/port/win32/socket.c,v 1.15 2006/12/04 22:23:40 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -582,7 +582,7 @@ pgwin32_socket_strerror(int err)`
`582`	`582`	`if (FormatMessage(FORMAT_MESSAGE_IGNORE_INSERTS \|FORMAT_MESSAGE_FROM_SYSTEM \|FORMAT_MESSAGE_FROM_HMODULE,`
`583`	`583`	`handleDLL,`
`584`	`584`	`err,`
`585`		`-MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),`
	`585`	`+MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT),`
`586`	`586`	`wserrbuf,`
`587`	`587`	`sizeof(wserrbuf)-1,`
`588`	`588`	`NULL)==0)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ winsock_strerror(int err, char *strerrbuf, size_t buflen)`
`309`	`309`	`success=0!=FormatMessage(`
`310`	`310`	`flags,`
`311`	`311`	`dlls[i].handle,err,`
`312`		`-MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),`
	`312`	`+MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT),`
`313`	`313`	`strerrbuf,buflen-64,`
`314`	`314`	`0`
`315`	`315`	`);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*Win32 (NT, Win2k, XP).replace() doesn't work on Win95/98/Me.`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.44 2006/11/08 20:12:05 tgl Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.45 2006/12/04 22:23:40 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -254,7 +254,7 @@ pgsymlink(const char oldpath, const char newpath)`
`254`	`254`	`errno=0;`
`255`	`255`	`FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER \|FORMAT_MESSAGE_FROM_SYSTEM,`
`256`	`256`	`NULL,GetLastError(),`
`257`		`-MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),`
	`257`	`+MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT),`
`258`	`258`	`(LPSTR)&msg,0,NULL);`
`259`	`259`	`#ifndefFRONTEND`
`260`	`260`	`ereport(ERROR,`

Comments

(0)