Commit0c620a5

committed

Improve error messages after LoadLibrary()

Move the file name to a format parameter to ease translatability. Adderror code where missing. Make the wording consistent.

1 parente894c61 commit0c620a5Copy full SHA for 0c620a5

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1518,8 +1518,8 @@ pg_SSPI_recvauth(Port *port)`
`1518`	`1518`	`secur32=LoadLibrary("SECUR32.DLL");`
`1519`	`1519`	`if (secur32==NULL)`
`1520`	`1520`	`ereport(ERROR,`
`1521`		`-(errmsg_internal("could not loadsecur32.dll: error code %lu",`
`1522`		`-GetLastError())));`
	`1521`	`+(errmsg("could not loadlibrary \"%s\": error code %lu",`
	`1522`	`+"SECUR32.DLL",GetLastError())));`
`1523`	`1523`
`1524`	`1524`	`_QuerySecurityContextToken= (QUERY_SECURITY_CONTEXT_TOKEN_FN)`
`1525`	`1525`	`GetProcAddress(secur32,"QuerySecurityContextToken");`
`@@ -2517,7 +2517,8 @@ InitializeLDAPConnection(Port port, LDAP *ldap)`
`2517`	`2517`	`* wldap32, but check anyway`
`2518`	`2518`	`*/`
`2519`	`2519`	`ereport(LOG,`
`2520`		`-(errmsg("could not load wldap32.dll")));`
	`2520`	`+(errmsg("could not load library \"%s\": error code %lu",`
	`2521`	`+"WLDAP32.DLL",GetLastError())));`
`2521`	`2522`	`ldap_unbind(*ldap);`
`2522`	`2523`	`returnSTATUS_ERROR;`
`2523`	`2524`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,8 @@ CreateRestrictedProcess(char cmd, PROCESS_INFORMATION processInfo)`
`61`	`61`	`Advapi32Handle=LoadLibrary("ADVAPI32.DLL");`
`62`	`62`	`if (Advapi32Handle==NULL)`
`63`	`63`	`{`
`64`		`-pg_log_error("could not loadadvapi32.dll: error code %lu",`
`65`		`-GetLastError());`
	`64`	`+pg_log_error("could not loadlibrary \"%s\": error code %lu",`
	`65`	`+"ADVAPI32.DLL",GetLastError());`
`66`	`66`	`return0;`
`67`	`67`	`}`
`68`	`68`

Comments

(0)