Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
00cf13a6
Commit
00cf13a6
authored
20 years ago
by
Marcus Meissner
Committed by
Alexandre Julliard
20 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Autodetect libgif so extension and try to load it.
parent
7d3431ed
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
configure
+74
-0
74 additions, 0 deletions
configure
configure.ac
+1
-0
1 addition, 0 deletions
configure.ac
dlls/oleaut32/olepicture.c
+10
-5
10 additions, 5 deletions
dlls/oleaut32/olepicture.c
include/config.h.in
+3
-0
3 additions, 0 deletions
include/config.h.in
with
88 additions
and
5 deletions
configure
+
74
−
0
View file @
00cf13a6
...
...
@@ -15546,6 +15546,80 @@ cat >>confdefs.h <<_ACEOF
#define SONAME_LIBUNGIF "$ac_cv_lib_soname_ungif"
_ACEOF
fi
echo "$as_me:$LINENO: checking for -lgif soname" >&5
echo $ECHO_N "checking for -lgif soname... $ECHO_C" >&6
if test "${ac_cv_lib_soname_gif+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_get_soname_save_LIBS=$LIBS
LIBS="-lgif $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* 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 DGifOpen ();
int
main ()
{
DGifOpen ();
;
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
ac_cv_lib_soname_gif=`$ac_cv_path_LDD conftest$ac_exeext | grep libgif\\.$LIBEXT | sed "s/^.*\(libgif\.$LIBEXT[^ ]*\).*$/\1/"`
if test "x$ac_cv_lib_soname_gif" = "x"
then
ac_cv_lib_soname_gif="libgif.$LIBEXT"
fi
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_soname_gif="libgif.$LIBEXT"
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_get_soname_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_soname_gif" >&5
echo "${ECHO_T}$ac_cv_lib_soname_gif" >&6
if test "x$ac_cv_lib_soname_gif" != xNONE
then
cat >>confdefs.h <<_ACEOF
#define SONAME_LIBGIF "$ac_cv_lib_soname_gif"
_ACEOF
fi
fi
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
1
−
0
View file @
00cf13a6
...
...
@@ -1028,6 +1028,7 @@ then
WINE_GET_SONAME(curses,waddch)
WINE_GET_SONAME(jpeg,jpeg_start_decompress)
WINE_GET_SONAME(ungif,DGifOpen)
WINE_GET_SONAME(gif,DGifOpen)
fi
...
...
This diff is collapsed.
Click to expand it.
dlls/oleaut32/olepicture.c
+
10
−
5
View file @
00cf13a6
...
...
@@ -50,9 +50,12 @@
*/
#ifdef HAVE_GIF_LIB_H
# include <gif_lib.h>
#ifndef SONAME_LIBUNGIF
#define SONAME_LIBUNGIF "libungif.so"
#endif
# ifndef SONAME_LIBUNGIF
# define SONAME_LIBUNGIF "libungif.so"
# endif
# ifndef SONAME_LIBGIF
# define SONAME_LIBGIF "libgif.so"
# endif
#endif
#define NONAMELESSUNION
...
...
@@ -903,7 +906,9 @@ struct gifdata {
static
void
*
load_libungif
(
void
)
{
if
((
libungif_handle
=
wine_dlopen
(
SONAME_LIBUNGIF
,
RTLD_NOW
,
NULL
,
0
))
!=
NULL
)
{
if
(((
libungif_handle
=
wine_dlopen
(
SONAME_LIBUNGIF
,
RTLD_NOW
,
NULL
,
0
))
!=
NULL
)
||
((
libungif_handle
=
wine_dlopen
(
SONAME_LIBGIF
,
RTLD_NOW
,
NULL
,
0
))
!=
NULL
)
)
{
#define LOAD_FUNCPTR(f) \
if((p##f = wine_dlsym(libungif_handle, #f, NULL, 0)) == NULL) { \
...
...
@@ -1022,7 +1027,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) {
if
(
!
libungif_handle
)
{
if
(
!
load_libungif
())
{
FIXME
(
"Failed reading GIF because unable to find %s
\n
"
,
SONAME_LIBUNGIF
);
FIXME
(
"Failed reading GIF because unable to find
%s/
%s
\n
"
,
SONAME_LIBUNGIF
,
SONAME_LIBGIF
);
return
E_FAIL
;
}
}
...
...
This diff is collapsed.
Click to expand it.
include/config.h.in
+
3
−
0
View file @
00cf13a6
...
...
@@ -881,6 +881,9 @@
/* Define to the soname of the libfreetype library. */
#undef SONAME_LIBFREETYPE
/* Define to the soname of the libgif library. */
#undef SONAME_LIBGIF
/* Define to the soname of the libGL library. */
#undef SONAME_LIBGL
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment