database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-26 12:21:12 +03:00
Code Activity

MinGW: Link with shell32.dll instead of shfolder.dll.

Browse Source 
This improves consistency with the MSVC build.  On buildfarm member
narwhal, since commit 846e91e022,
shfolder.dll:SHGetFolderPath() crashes when dblink calls it by way of
pqGetHomeDirectory().  Back-patch to 9.4, where that commit first
appeared.  How it caused this regression remains a mystery.  This is a
partial revert of commit 889f038129, which
adopted shfolder.dll for Windows NT 4.0 compatibility.  PostgreSQL 8.2
dropped support for that operating system.
This commit is contained in:
Noah Misch
2014-10-21 22:55:43 -04:00
parent 31dd7fcd03
commit 53566fc094
5 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Makefile.global.in
View File

@ -549,10 +549,9 @@ LIBOBJS = @LIBOBJS@
LIBS := -lpgcommon -lpgport $(LIBS) LIBS := -lpgcommon -lpgport $(LIBS)
# to make ws2_32.lib the last library, and always link with shfolder, # to make ws2_32.lib the last library
# so SHGetFolderName isn't picked up from shell32.dll
ifeq ($(PORTNAME),win32) ifeq ($(PORTNAME),win32)
LIBS += -lws2_32 -lshfolder LIBS += -lws2_32
endif endif
# Not really standard libc functions, used by the backend. # Not really standard libc functions, used by the backend.

5
src/interfaces/ecpg/ecpglib/Makefile
View File

@ -39,11 +39,6 @@ SHLIB_PREREQS = submake-libpq submake-pgtypeslib
SHLIB_EXPORTS = exports.txt SHLIB_EXPORTS = exports.txt
ifeq ($(PORTNAME), win32)
# Link to shfolder.dll instead of shell32.dll
SHLIB_LINK += -lshfolder
endif
PKG_CONFIG_REQUIRES_PRIVATE = libpq libpgtypes PKG_CONFIG_REQUIRES_PRIVATE = libpq libpgtypes
all: all-lib all: all-lib

2
src/interfaces/libpq/Makefile
View File

@ -74,7 +74,7 @@ else
SHLIB_LINK += $(filter -lcrypt -ldes -lcom_err -lcrypto -lk5crypto -lkrb5 -lgssapi32 -lssl -lsocket -lnsl -lresolv -lintl $(PTHREAD_LIBS), $(LIBS)) $(LDAP_LIBS_FE) SHLIB_LINK += $(filter -lcrypt -ldes -lcom_err -lcrypto -lk5crypto -lkrb5 -lgssapi32 -lssl -lsocket -lnsl -lresolv -lintl $(PTHREAD_LIBS), $(LIBS)) $(LDAP_LIBS_FE)
endif endif
ifeq ($(PORTNAME), win32) ifeq ($(PORTNAME), win32)
SHLIB_LINK += -lshfolder -lws2_32 -lsecur32 $(filter -leay32 -lssleay32 -lcomerr32 -lkrb5_32, $(LIBS)) SHLIB_LINK += -lshell32 -lws2_32 -lsecur32 $(filter -leay32 -lssleay32 -lcomerr32 -lkrb5_32, $(LIBS))
endif endif
SHLIB_EXPORTS = exports.txt SHLIB_EXPORTS = exports.txt

2
src/interfaces/libpq/win32.mak
View File

@ -214,7 +214,7 @@ CPP_SBRS=.
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res" RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
LINK32=link.exe LINK32=link.exe
LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib ws2_32.lib secur32.lib $(SSL_LIBS) $(KFW_LIB) $(ADD_SECLIB) \ LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shell32.lib ws2_32.lib secur32.lib $(SSL_LIBS) $(KFW_LIB) $(ADD_SECLIB) \
/nologo /subsystem:windows /dll $(LOPT) /incremental:no \ /nologo /subsystem:windows /dll $(LOPT) /incremental:no \
/pdb:"$(OUTDIR)\libpqdll.pdb" /machine:$(CPU) \ /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:$(CPU) \
/out:"$(OUTDIR)\$(OUTFILENAME).dll"\ /out:"$(OUTDIR)\$(OUTFILENAME).dll"\

8
src/port/path.c
View File

@ -785,9 +785,11 @@ get_home_path(char *ret_path)
char *tmppath; char *tmppath;
/* /*
* Note: We use getenv here because the more modern * Note: We use getenv() here because the more modern SHGetFolderPath()
* SHGetSpecialFolderPath() will force us to link with shell32.lib which * would force the backend to link with shell32.lib, which eats valuable
* eats valuable desktop heap. * desktop heap. XXX This function is used only in psql, which already
* brings in shell32 via libpq. Moving this function to its own file
* would keep it out of the backend, freeing it from this concern.
*/ */
tmppath = getenv("APPDATA"); tmppath = getenv("APPDATA");
if (!tmppath) if (!tmppath)