Commit7a19863

committed

Merge branch 'REL9_5_STABLE' into PGPRO9_5

Merge FormatMessage fix

2 parents38251d0 +491e847 commit7a19863Copy full SHA for 7a19863

File tree

+15

-5

lines changed

+15

-5

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1011,7 +1011,9 @@ pg_SSPI_error(int severity, const char *errmsg, SECURITY_STATUS r)`
`1011`	`1011`	`{`
`1012`	`1012`	`charsysmsg[256];`
`1013`	`1013`
`1014`		`-if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,NULL,r,0,`
	`1014`	`+if (FormatMessage(FORMAT_MESSAGE_IGNORE_INSERTS \|`
	`1015`	`+FORMAT_MESSAGE_FROM_SYSTEM,`
	`1016`	`+NULL,r,0,`
`1015`	`1017`	`sysmsg,sizeof(sysmsg),NULL)==0)`
`1016`	`1018`	`ereport(severity,`
`1017`	`1019`	`(errmsg_internal("%s",errmsg),`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,9 @@ pgwin32_socket_strerror(int err)`
`658`	`658`	`}`
`659`	`659`
`660`	`660`	`ZeroMemory(&wserrbuf,sizeof(wserrbuf));`
`661`		`-if (FormatMessage(FORMAT_MESSAGE_IGNORE_INSERTS \|FORMAT_MESSAGE_FROM_SYSTEM \|FORMAT_MESSAGE_FROM_HMODULE,`
	`661`	`+if (FormatMessage(FORMAT_MESSAGE_IGNORE_INSERTS \|`
	`662`	`+FORMAT_MESSAGE_FROM_SYSTEM \|`
	`663`	`+FORMAT_MESSAGE_FROM_HMODULE,`
`662`	`664`	`handleDLL,`
`663`	`665`	`err,`
`664`	`666`	`MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT),`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,9 @@ pg_SSPI_error(PGconn conn, const char mprefix, SECURITY_STATUS r)`
`234`	`234`	`{`
`235`	`235`	`charsysmsg[256];`
`236`	`236`
`237`		`-if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,NULL,r,0,`
	`237`	`+if (FormatMessage(FORMAT_MESSAGE_IGNORE_INSERTS \|`
	`238`	`+FORMAT_MESSAGE_FROM_SYSTEM,`
	`239`	`+NULL,r,0,`
`238`	`240`	`sysmsg,sizeof(sysmsg),NULL)==0)`
`239`	`241`	`printfPQExpBuffer(&conn->errorMessage,"%s: SSPI error %x\n",`
`240`	`242`	`mprefix, (unsignedint)r);`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,9 @@ pgsymlink(const char oldpath, const char newpath)`
`206`	`206`	`LPSTRmsg;`
`207`	`207`
`208`	`208`	`errno=0;`
`209`		`-FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER \|FORMAT_MESSAGE_FROM_SYSTEM,`
	`209`	`+FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER \|`
	`210`	`+FORMAT_MESSAGE_IGNORE_INSERTS \|`
	`211`	`+FORMAT_MESSAGE_FROM_SYSTEM,`
`210`	`212`	`NULL,GetLastError(),`
`211`	`213`	`MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT),`
`212`	`214`	`(LPSTR)&msg,0,NULL);`
`@@ -281,7 +283,9 @@ pgreadlink(const char path, char buf, size_t size)`
`281`	`283`	`LPSTRmsg;`
`282`	`284`
`283`	`285`	`errno=0;`
`284`		`-FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER \|FORMAT_MESSAGE_FROM_SYSTEM,`
	`286`	`+FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER \|`
	`287`	`+FORMAT_MESSAGE_IGNORE_INSERTS \|`
	`288`	`+FORMAT_MESSAGE_FROM_SYSTEM,`
`285`	`289`	`NULL,GetLastError(),`
`286`	`290`	`MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT),`
`287`	`291`	`(LPSTR)&msg,0,NULL);`

Comments

(0)