Kouhei Sutou
null+****@clear*****
Sun Jul 26 17:48:01 JST 2015
Kouhei Sutou 2015-07-26 17:48:01 +0900 (Sun, 26 Jul 2015) New Revision: 77727b63ad09a6ec1071f4669b6db99d2261165e https://github.com/groonga/groonga/commit/77727b63ad09a6ec1071f4669b6db99d2261165e Message: windows: use 0 for convert flags CP_UTF8 must use 0. https://msdn.microsoft.com/en-us/library/windows/desktop/dd319072%28v=vs.85%29.aspx > Note For UTF-8 or code page 54936 (GB18030, starting with Windows > Vista), dwFlags must be set to either 0 or > MB_ERR_INVALID_CHARS. Otherwise, the function fails with > ERROR_INVALID_FLAGS. Modified files: lib/windows_event_logger.c Modified: lib/windows_event_logger.c (+4 -3) =================================================================== --- lib/windows_event_logger.c 2015-07-26 16:41:26 +0900 (fd15d2c) +++ lib/windows_event_logger.c 2015-07-26 17:48:01 +0900 (6b60ec9) @@ -93,6 +93,7 @@ windows_event_logger_log(grn_ctx *ctx, grn_log_level level, const char level_marks[] = " EACewnid-"; grn_obj formatted_buffer; UINT code_page; + DWORD convert_flags = 0; int n_converted_chars; #define CONVERTED_BUFFER_SIZE 512 @@ -127,7 +128,7 @@ windows_event_logger_log(grn_ctx *ctx, grn_log_level level, } n_converted_chars = MultiByteToWideChar(code_page, - MB_PRECOMPOSED, + convert_flags, GRN_TEXT_VALUE(&formatted_buffer), GRN_TEXT_LEN(&formatted_buffer), NULL, @@ -136,7 +137,7 @@ windows_event_logger_log(grn_ctx *ctx, grn_log_level level, WCHAR converted_buffer[CONVERTED_BUFFER_SIZE]; const WCHAR *strings[1]; n_converted_chars = MultiByteToWideChar(code_page, - MB_PRECOMPOSED, + convert_flags, GRN_TEXT_VALUE(&formatted_buffer), GRN_TEXT_LEN(&formatted_buffer), converted_buffer, @@ -157,7 +158,7 @@ windows_event_logger_log(grn_ctx *ctx, grn_log_level level, const WCHAR *strings[1]; converted = GRN_MALLOCN(WCHAR, n_converted_chars); n_converted_chars = MultiByteToWideChar(code_page, - MB_PRECOMPOSED, + convert_flags, GRN_TEXT_VALUE(&formatted_buffer), GRN_TEXT_LEN(&formatted_buffer), converted, -------------- next part -------------- HTML����������������������������...Download