February 2006 - Wine-Commits

H. Verbeet : wined3d: Don't keep a reference to the container, as it creates a
by Alexandre Julliard Feb. 13, 2006

Feb. 13, 2006

Module: wine Branch: refs/heads/master Commit: 7a4b59b0c20d643dcd57d8b5f0d5d6d5fa07ee84 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7a4b59b0c20d643dcd57d8b… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Feb 13 13:23:58 2006 +0100 wined3d: Don't keep a reference to the container, as it creates a circular reference. --- dlls/wined3d/surface.c | 10 +--------- dlls/wined3d/volume.c | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ab25c96..4cb1b3e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -69,9 +69,6 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release glDeleteTextures(1, &This->glDescription.textureName); LEAVE_GL(); } - if (This->container) { - IWineD3DBase_Release(This->container); - } IWineD3DResourceImpl_CleanUp((IWineD3DResource *)iface); TRACE("(%p) Released\n", This); @@ -1357,12 +1354,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetCo TRACE("This %p, container %p\n", This, container); - if (container) { - IWineD3DBase_AddRef(container); - } - if (This->container) { - IWineD3DBase_Release(This->container); - } + /* We can't keep a reference to the container, since the container already keeps a reference to us. */ TRACE("Setting container to %p from %p\n", container, This->container); This->container = container; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 0c367bc..3fa1717 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -55,9 +55,6 @@ ULONG WINAPI IWineD3DVolumeImpl_Release( TRACE("(%p) : Releasing from %ld\n", This, This->resource.ref); ref = InterlockedDecrement(&This->resource.ref); if (ref == 0) { - if (This->container) { - IWineD3DBase_Release(This->container); - } IWineD3DResourceImpl_CleanUp((IWineD3DResource *)iface); HeapFree(GetProcessHeap(), 0, This); } @@ -252,12 +249,7 @@ HRESULT WINAPI IWineD3DVolumeImpl_SetCon TRACE("This %p, container %p\n", This, container); - if (container) { - IWineD3DBase_AddRef(container); - } - if (This->container) { - IWineD3DBase_Release(This->container); - } + /* We can't keep a reference to the container, since the container already keeps a reference to us. */ TRACE("Setting container to %p from %p\n", container, This->container); This->container = container;

1 0

Francois Gouget : wined3d: Protect float.h inclusion.
by Alexandre Julliard Feb. 13, 2006

Feb. 13, 2006

Module: wine Branch: refs/heads/master Commit: 0ff18f58fa9fb64697c9bcabed6274c0dcef5deb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0ff18f58fa9fb64697c9bca… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 13 13:23:42 2006 +0100 wined3d: Protect float.h inclusion. --- dlls/wined3d/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4b10c6d..2f6910b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -22,7 +22,9 @@ */ #include "config.h" -#include <float.h> +#ifdef HAVE_FLOAT_H +# include <float.h> +#endif #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d);

1 0

Francois Gouget : mshtml: Add trailing '\n's to ok() calls.
by Alexandre Julliard Feb. 13, 2006

Feb. 13, 2006

Module: wine Branch: refs/heads/master Commit: deaaa681aa7c978e14acf2fe3e497b56a7eb77dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=deaaa681aa7c978e14acf2f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 13 13:23:13 2006 +0100 mshtml: Add trailing '\n's to ok() calls. --- dlls/mshtml/tests/htmldoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index fee6565..9b99c62 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -176,7 +176,7 @@ static HRESULT WINAPI HlinkFrame_Navigat hres = IHlink_GetHlinkSite(pihlNavigate, &site, &site_data); ok(hres == S_OK, "GetHlinkSite failed: %08lx\n", hres); - ok(site == NULL, "site = %p\n, expected NULL", site); + ok(site == NULL, "site = %p\n, expected NULL\n", site); ok(site_data == 0xdeadbeef, "site_data = %lx\n", site_data); }

1 0

Francois Gouget : d3dtypes: Fix windows.h inclusion.
by Alexandre Julliard Feb. 13, 2006

Feb. 13, 2006

Module: wine Branch: refs/heads/master Commit: c2f99c51986f81078b1e56c3d75e9a0a9ada124d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c2f99c51986f81078b1e56c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 13 13:22:59 2006 +0100 d3dtypes: Fix windows.h inclusion. --- include/d3dtypes.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/d3dtypes.h b/include/d3dtypes.h index 6670e71..36efec0 100644 --- a/include/d3dtypes.h +++ b/include/d3dtypes.h @@ -25,7 +25,9 @@ #ifndef __WINE_D3DTYPES_H #define __WINE_D3DTYPES_H -/* #include <windows.h> FIXME: Need to include for compatibility. Inclusion caused compile fail */ +#ifndef __WINESRC__ +# include <windows.h> +#endif #include <float.h> #include <ddraw.h>

1 0

Hans Leidekker : kernel: Report a tape device as FILE_TYPE_CHAR.
by Alexandre Julliard Feb. 13, 2006

Feb. 13, 2006

Module: wine Branch: refs/heads/master Commit: e0de496f6119a42b64b2978aae9352e717d821f5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e0de496f6119a42b64b2978… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Feb 13 13:22:34 2006 +0100 kernel: Report a tape device as FILE_TYPE_CHAR. --- dlls/kernel/file.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel/file.c b/dlls/kernel/file.c index 9c5973a..7f0edf3 100644 --- a/dlls/kernel/file.c +++ b/dlls/kernel/file.c @@ -775,6 +775,7 @@ DWORD WINAPI GetFileType( HANDLE hFile ) case FILE_DEVICE_NULL: case FILE_DEVICE_SERIAL_PORT: case FILE_DEVICE_PARALLEL_PORT: + case FILE_DEVICE_TAPE: case FILE_DEVICE_UNKNOWN: return FILE_TYPE_CHAR; case FILE_DEVICE_NAMED_PIPE:

1 0

Hans Leidekker : crypt32: Add a stub for CryptQueryObject.
by Alexandre Julliard Feb. 13, 2006

Feb. 13, 2006

Module: wine Branch: refs/heads/master Commit: c27526743bcdffd9449d68f3ccb735037b0029f4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c27526743bcdffd9449d68f… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Feb 13 13:22:25 2006 +0100 crypt32: Add a stub for CryptQueryObject. --- dlls/crypt32/crypt32.spec | 1 + dlls/crypt32/main.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 34973e5..6a0b2d6 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -137,6 +137,7 @@ @ stub CryptMsgUpdate @ stub CryptMsgVerifyCountersignatureEncoded @ stdcall CryptProtectData(ptr wstr ptr ptr ptr long ptr) +@ stdcall CryptQueryObject(long ptr long long long ptr ptr ptr ptr ptr ptr) @ stdcall CryptRegisterDefaultOIDFunction(long str long wstr) @ stdcall CryptRegisterOIDFunction(long str str wstr str) @ stub CryptRegisterOIDInfo diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 7a9c6f1..4a7de5f 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -364,3 +364,16 @@ BOOL WINAPI I_CryptInstallOssGlobal(DWOR FIXME("%08lx %08lx %08lx\n", x, y, z); return FALSE; } + +BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void* pvObject, + DWORD dwExpectedContentTypeFlags, DWORD dwExpectedFormatTypeFlags, + DWORD dwFlags, DWORD* pdwMsgAndCertEncodingType, DWORD* pdwContentType, + DWORD* pdwFormatType, HCERTSTORE* phCertStore, HCRYPTMSG* phMsg, + const void** ppvContext) +{ + FIXME( "%08lx %p %08lx %08lx %08lx %p %p %p %p %p %p", dwObjectType, + pvObject, dwExpectedContentTypeFlags, dwExpectedFormatTypeFlags, + dwFlags, pdwMsgAndCertEncodingType, pdwContentType, pdwFormatType, + phCertStore, phMsg, ppvContext); + return FALSE; +}

1 0

Hans Leidekker : netapi32: Improve stub for NetUserModalsGet.
by Alexandre Julliard Feb. 13, 2006

Feb. 13, 2006

Module: wine Branch: refs/heads/master Commit: b9709d805cc3d18987a785da830074a7e3c52c1d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b9709d805cc3d18987a785d… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Feb 13 13:22:11 2006 +0100 netapi32: Improve stub for NetUserModalsGet. Tell the caller this host is not part of a domain. --- dlls/netapi32/access.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index e3e0a36..614e2a4 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -554,6 +554,12 @@ NetGetDCName(LPCWSTR servername, LPCWSTR NET_API_STATUS WINAPI NetUserModalsGet(LPCWSTR szServer, DWORD level, LPBYTE *pbuffer) { FIXME("(%s %ld %p) stub!\n", debugstr_w(szServer), level, pbuffer); + + if (level == 2) + { + *pbuffer = NULL; + return NERR_Success; + } return NERR_InternalError; }

1 0

Dmitry Timoshkov : msvfw32: Fix typos in the control state handling.
by Alexandre Julliard Feb. 13, 2006

Feb. 13, 2006

Module: wine Branch: refs/heads/master Commit: d4774ba1c66e9f4acabf977ecfb1d763e30eaa1f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d4774ba1c66e9f4acabf977… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Feb 13 12:48:11 2006 +0100 msvfw32: Fix typos in the control state handling. Fix typos in the control state handling, add state checks for IDOK and IDCANCEL control notification handlers. --- dlls/msvideo/msvideo_main.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c index 2ac5ff3..ce9a25e 100644 --- a/dlls/msvideo/msvideo_main.c +++ b/dlls/msvideo/msvideo_main.c @@ -811,7 +811,7 @@ static INT_PTR CALLBACK icm_choose_compr struct codec_info *ic; BOOL enable = FALSE; - if (HIWORD(wparam != CBN_SELCHANGE)) + if (HIWORD(wparam) != CBN_SELCHANGE) break; cur_sel = SendMessageW((HWND)lparam, CB_GETCURSEL, 0, 0); @@ -832,7 +832,7 @@ static INT_PTR CALLBACK icm_choose_compr INT cur_sel; struct codec_info *ic; - if (HIWORD(wparam != BN_CLICKED)) + if (HIWORD(wparam) != BN_CLICKED) break; cur_sel = SendMessageW(list, CB_GETCURSEL, 0, 0); @@ -850,6 +850,9 @@ static INT_PTR CALLBACK icm_choose_compr INT cur_sel; struct codec_info *ic; + if (HIWORD(wparam) != BN_CLICKED) + break; + cur_sel = SendMessageW(list, CB_GETCURSEL, 0, 0); ic = (struct codec_info *)SendMessageW(list, CB_GETITEMDATA, cur_sel, 0); if (ic) @@ -871,6 +874,9 @@ static INT_PTR CALLBACK icm_choose_compr HWND list = GetDlgItem(hdlg, IDC_COMP_LIST); INT idx = 0; + if (HIWORD(wparam) != BN_CLICKED) + break; + while (1) { struct codec_info *ic;

1 0

Alexandre Julliard : libwine: Use dladdr if supported to get the run-time path of libwine.so
by Alexandre Julliard Feb. 13, 2006

Feb. 13, 2006

Module: wine Branch: refs/heads/master Commit: 0b34fb365657b9983a591610b2d80e298623d6f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0b34fb365657b9983a59161… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 11 22:38:44 2006 +0100 libwine: Use dladdr if supported to get the run-time path of libwine.so and define the default dll and bin directories relative to it. --- libs/wine/Makefile.in | 2 - libs/wine/config.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++- libs/wine/loader.c | 6 ++- 3 files changed, 112 insertions(+), 6 deletions(-) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index b9ddf42..34b6400 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ LIBRARY = wine SOVERSION = 1 VERSCRIPT = $(SRCDIR)/wine.map -EXTRADEFS = -D__WINESRC__ -DBINDIR="\"$(bindir)\"" -DDLLDIR="\"$(dlldir)\"" +EXTRADEFS = -D__WINESRC__ -DBINDIR="\"$(bindir)\"" -DLIBDIR="\"$(libdir)\"" -DDLLDIR="\"$(dlldir)\"" EXTRALIBS = $(LIBPORT) @DLLIBS@ @CRTLIBS@ @LDLIBWINEFLAGS@ C_SRCS = \ diff --git a/libs/wine/config.c b/libs/wine/config.c index b2b039c..33aa87a 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -101,6 +101,103 @@ inline static void remove_trailing_slash while (len > 1 && path[len-1] == '/') path[--len] = 0; } +/* determine where the destination path is located relative to the 'from' path */ +inline static const char *get_relative_path( const char *from, const char *dest, unsigned int *dotdots ) +{ +#define DIR_END(p) (*(p) == 0 || *(p) == '/') + const char *start; + + *dotdots = 0; + for (;;) + { + while (*from == '/') from++; + while (*dest == '/') dest++; + start = dest; /* save start of next path element */ + if (!*from) break; + + while (!DIR_END(from) && *from == *dest) { from++; dest++; } + if (DIR_END(from) && DIR_END(dest)) continue; + + /* count remaining elements in 'from' */ + do + { + (*dotdots)++; + while (!DIR_END(from)) from++; + while (*from == '/') from++; + } + while (*from); + break; + } + return start; +#undef DIR_END +} + +/* return the directory that contains the library at run-time */ +static const char *get_runtime_libdir(void) +{ + static char *libdir; + +#ifdef HAVE_DLADDR + Dl_info info; + char *p; + + if (!libdir && dladdr( get_runtime_libdir, &info ) && (p = strrchr( info.dli_fname, '/' ))) + { + unsigned int len = p - info.dli_fname; + if (!len) len++; /* include initial slash */ + libdir = xmalloc( len + 1 ); + memcpy( libdir, info.dli_fname, len ); + libdir[len] = 0; + } +#endif /* HAVE_DLADDR */ + return libdir; +} + +/* determine the proper location of the given path based on the current libdir */ +static char *get_path_from_libdir( const char *path, const char *filename ) +{ + char *p, *ret; + const char *libdir = get_runtime_libdir(); + + /* retrieve the library load path */ + + if (libdir) + { + unsigned int dotdots = 0; + const char *start = get_relative_path( LIBDIR, path, &dotdots ); + + ret = xmalloc( strlen(libdir) + 3 * dotdots + strlen(start) + strlen(filename) + 3 ); + strcpy( ret, libdir ); + p = ret + strlen(libdir); + if (p[-1] != '/') *p++ = '/'; + + while (dotdots--) + { + p[0] = '.'; + p[1] = '.'; + p[2] = '/'; + p += 3; + } + + strcpy( p, start ); + p += strlen(p); + } + else + { + ret = xmalloc( strlen(path) + strlen(filename) + 2 ); + strcpy( ret, path ); + p = ret + strlen(ret); + } + + if (*filename) + { + if (p[-1] != '/') *p++ = '/'; + strcpy( p, filename ); + } + else if (p[-1] == '/') p[-1] = 0; + return ret; +} + /* initialize the server directory value */ static void init_server_dir( dev_t dev, ino_t ino ) { @@ -127,6 +224,15 @@ static void init_server_dir( dev_t dev, sprintf( p, "%lx", (unsigned long)ino ); } +/* retrieve the default dll dir */ +const char *get_default_dlldir(void) +{ + static const char *dlldir; + + if (!dlldir) dlldir = get_path_from_libdir( DLLDIR, "" ); + return dlldir; +} + /* initialize all the paths values */ static void init_paths(void) { @@ -314,9 +420,7 @@ void wine_exec_wine_binary( const char * else if (!name) name = argv0_name; /* first, try bin directory */ - argv[0] = xmalloc( sizeof(BINDIR "/") + strlen(name) ); - strcpy( argv[0], BINDIR "/" ); - strcat( argv[0], name ); + argv[0] = get_path_from_libdir( BINDIR, name ); preloader_exec( argv, envp, use_preloader ); free( argv[0] ); diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 50ab544..e58ab7c 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -74,13 +74,14 @@ static const IMAGE_NT_HEADERS *main_exe; static load_dll_callback_t load_dll_callback; -static const char default_dlldir[] = DLLDIR; +static const char *default_dlldir; static const char **dll_paths; static int nb_dll_paths; static int dll_path_maxlen; extern void mmap_init(void); extern void debug_init(void); +extern const char *get_default_dlldir(void); /* build the dll load path from the WINEDLLPATH variable */ static void build_dll_path(void) @@ -121,7 +122,8 @@ static void build_dll_path(void) } /* append default dll dir (if not empty) to path */ - if ((len = sizeof(default_dlldir)-1)) + default_dlldir = get_default_dlldir(); + if ((len = strlen(default_dlldir)) > 0) { if (len > dll_path_maxlen) dll_path_maxlen = len; dll_paths[nb_dll_paths++] = default_dlldir;

1 0

Alexandre Julliard : configure: Added check for dladdr in libdl.
by Alexandre Julliard Feb. 13, 2006

Feb. 13, 2006

Module: wine Branch: refs/heads/master Commit: 266c609dd1dab8caab71ea1cc3949dacfcde8c40 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=266c609dd1dab8caab71ea1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 11 20:55:50 2006 +0100 configure: Added check for dladdr in libdl. --- configure | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 1 include/config.h.in | 3 + 3 files changed, 108 insertions(+), 0 deletions(-) diff --git a/configure b/configure index daee535..80e58c5 100755 --- a/configure +++ b/configure @@ -12305,6 +12305,110 @@ fi fi done + ac_wine_check_funcs_save_LIBS="$LIBS" +LIBS="$LIBS $DLLIBS" + +for ac_func in dladdr +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $ac_func + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +LIBS="$ac_wine_check_funcs_save_LIBS" else LIBEXT="a" fi diff --git a/configure.ac b/configure.ac index 6532db1..7784f8a 100644 --- a/configure.ac +++ b/configure.ac @@ -937,6 +937,7 @@ case $host_os in [AC_DEFINE(HAVE_DLOPEN,1,[Define if you have dlopen]) DLLIBS="-ldl"], [LIBEXT="a"])]) + WINE_CHECK_LIB_FUNCS(dladdr,[$DLLIBS]) else LIBEXT="a" fi diff --git a/include/config.h.in b/include/config.h.in index c937226..ed6fc4c 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -59,6 +59,9 @@ /* Define to 1 if you have the <direct.h> header file. */ #undef HAVE_DIRECT_H +/* Define to 1 if you have the `dladdr' function. */ +#undef HAVE_DLADDR + /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H

1 0