mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the win32 putenv() override update *all* present versions of the

Browse Source 
MSVCRxx runtime, not just the current + Visual Studio 6 (MSVCRT). Clearly
there can be an almost unlimited number of runtimes loaded at the same
time.

Per report from Hiroshi Inoue
This commit is contained in:
Magnus Hagander 2010-01-01 14:57:19 +00:00
parent cae9c0d8c1
commit 1c0f0d99ae
1 changed files with 62 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/port/win32env.c
View File

@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/port/win32env.c,v 1.3 2009/06/11 14:49:15 momjian Exp $
* $PostgreSQL: pgsql/src/port/win32env.c,v 1.3.2.1 2010/01/01 14:57:19 mha Exp $
*
*-------------------------------------------------------------------------
*/
@ -27,30 +27,72 @@ pgwin32_putenv(const char *envval)
* Each version of MSVCRT has its own _putenv() call in the runtime
* library.
*
* If we're in VC 7.0 or later (means != mingw), update in the 6.0
* MSVCRT.DLL environment as well, to work with third party libraries
* linked against it (such as gnuwin32 libraries).
* mingw always uses MSVCRT.DLL, but if we are in a Visual C++ environment,
* attempt to update the environment in all MSVCRT modules that are
* currently loaded, to work properly with any third party libraries
* linked against a different MSVCRT but still relying on environment
* variables.
*
* Also separately update the system environment that gets inherited by
* subprocesses.
*/
#if defined(_MSC_VER) && (_MSC_VER >= 1300)
#ifdef _MSC_VER
typedef int (_cdecl * PUTENVPROC) (const char *);
static struct {
char *modulename;
HMODULE hmodule;
static PUTENVPROC putenvFunc = NULL;
int ret;
PUTENVPROC putenvFunc;
} rtmodules[] = {
{ "msvcrt", 0, NULL}, /* Visual Studio 6.0 / mingw */
{ "msvcr70", 0, NULL}, /* Visual Studio 2002 */
{ "msvcr71", 0, NULL}, /* Visual Studio 2003 */
{ "msvcr80", 0, NULL}, /* Visual Studio 2005 */
{ "msvcr90", 0, NULL}, /* Visual Studio 2008 */
{ NULL, 0, NULL}
};
int i;
if (putenvFunc == NULL)
for (i = 0; rtmodules[i].modulename; i++)
{
hmodule = GetModuleHandle("msvcrt");
if (hmodule == NULL)
return 1;
putenvFunc = (PUTENVPROC) GetProcAddress(hmodule, "_putenv");
if (putenvFunc == NULL)
return 1;
if (rtmodules[i].putenvFunc == NULL)
{
if (rtmodules[i].hmodule == 0)
{
/* Not attempted before, so try to find this DLL */
rtmodules[i].hmodule = GetModuleHandle(rtmodules[i].modulename);
if (rtmodules[i].hmodule == NULL)
{
/*
* Set to INVALID_HANDLE_VALUE so we know we have tried this one
* before, and won't try again.
*/
rtmodules[i].hmodule = INVALID_HANDLE_VALUE;
continue;
}
ret = putenvFunc(envval);
if (ret != 0)
return ret;
#endif /* _MSC_VER >= 1300 */
else
{
rtmodules[i].putenvFunc = (PUTENVPROC) GetProcAddress(rtmodules[i].hmodule, "_putenv");
if (rtmodules[i].putenvFunc == NULL)
{
CloseHandle(rtmodules[i].hmodule);
rtmodules[i].hmodule = INVALID_HANDLE_VALUE;
continue;
}
}
}
else
{
/*
* Module loaded, but we did not find the function last time. We're
* not going to find it this time either...
*/
continue;
}
}
/* At this point, putenvFunc is set or we have exited the loop */
rtmodules[i].putenvFunc(envval);
}
#endif /* _MSC_VER */
/*
* Update the process environment - to make modifications visible to child