Apply solution for CORE-1129. Thanks to Bill Oliver.

I didn't change install_reg, install_svc and fbcpl's fbdialog.
FirebirdSQL · Feb 15, 2007 · 87c9f2b · 87c9f2b
1 parent 3a42cf1
commit 87c9f2b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/jrd/gds.cpp b/src/jrd/gds.cpp
@@ -946,14 +946,14 @@ static SLONG safe_interpret(char* const s, const size_t bufsize,
 
 #ifdef WIN_NT
 	case isc_arg_win32:
-		if (!FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
+		if (!FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_MAX_WIDTH_MASK,
 										 NULL,
 										 code,
 										 GetUserDefaultLangID(),
 										 s,
 										 bufsize,
-						                 NULL)
-		  && !FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
+										 NULL)
+		  && !FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_MAX_WIDTH_MASK,
 										 NULL,
 										 code,
 										 0, // TMN: Fallback to system known language

diff --git a/src/utilities/gstat/dba.epp b/src/utilities/gstat/dba.epp
@@ -1375,14 +1375,14 @@ static void db_error( SLONG status)
 	tdba* tddba = tdba::getSpecific();
 	tddba->page_number = -1;
 
-	if (!FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
+	if (!FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_MAX_WIDTH_MASK,
 						NULL,
 						status,
 						GetUserDefaultLangID(),
 						s,
 						sizeof(s),
 						NULL)
-		&& !FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
+		&& !FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_MAX_WIDTH_MASK,
 						NULL,
 						status,
 						0, // TMN: Fallback to system known language