diff options
| author | Bruce Momjian | 2006-12-04 22:23:40 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2006-12-04 22:23:40 +0000 |
| commit | 1e22e605050eded6ed49f049678782dba9e864cf (patch) | |
| tree | d4081c43de8e4bb2eb0a519a56a6c76c29f661cf /src/backend/port | |
| parent | 6cd9a58480e37e11adf7fa7d406ba118d2a7e4e5 (diff) | |
Patch of Win32 Encoding problem for server messages using
FormatMessage() (This should have been in 8.2.0, patched to 8.2.X and
HEAD):
I think this problem to be complex....
http://archives.postgresql.org/pgsql-hackers/2006-11/msg00042.php
FormatMessage of windows cannot consider the encoding of the database.
However, I should try the solution now. It is necessary to clear the
problem.
Multi character-code exists together in message and log. It doesn't
consider
the data base encoding that the user intended....
The user in multi-byte country can try this.
http://inet.winpg.jp/~saito/pg_bug/MessageCheck.c
That is, it is likely to become it in this manner.(Japanese)
http://inet.winpg.jp/~saito/pg_bug/FormatMessage998.png
Hiroshi Saito
Diffstat (limited to 'src/backend/port')
| -rw-r--r-- | src/backend/port/dynloader/win32.c | 4 | ||||
| -rw-r--r-- | src/backend/port/win32/socket.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/port/dynloader/win32.c b/src/backend/port/dynloader/win32.c index 72d27fddcdc..980b424b97b 100644 --- a/src/backend/port/dynloader/win32.c +++ b/src/backend/port/dynloader/win32.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/port/dynloader/win32.c,v 1.8 2006/06/07 22:24:43 momjian Exp $ */ +/* $PostgreSQL: pgsql/src/backend/port/dynloader/win32.c,v 1.9 2006/12/04 22:23:40 momjian Exp $ */ #include "postgres.h" @@ -18,7 +18,7 @@ set_dl_error(void) FORMAT_MESSAGE_FROM_SYSTEM, NULL, err, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), last_dyn_error, sizeof(last_dyn_error) - 1, NULL) == 0) diff --git a/src/backend/port/win32/socket.c b/src/backend/port/win32/socket.c index 6489c64daee..0dc62a48119 100644 --- a/src/backend/port/win32/socket.c +++ b/src/backend/port/win32/socket.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/socket.c,v 1.14 2006/10/13 13:59:47 teodor Exp $ + * $PostgreSQL: pgsql/src/backend/port/win32/socket.c,v 1.15 2006/12/04 22:23:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -582,7 +582,7 @@ pgwin32_socket_strerror(int err) if (FormatMessage(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, handleDLL, err, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), wserrbuf, sizeof(wserrbuf) - 1, NULL) == 0) |