Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
7814da1f
Commit
7814da1f
authored
Apr 06, 2020
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msxml3: Use standard dlopen() instead of the libwine wrappers.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
4d0034e8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
main.c
dlls/msxml3/main.c
+4
-5
No files found.
dlls/msxml3/main.c
View file @
7814da1f
...
@@ -55,7 +55,6 @@
...
@@ -55,7 +55,6 @@
#include "wine/unicode.h"
#include "wine/unicode.h"
#include "wine/debug.h"
#include "wine/debug.h"
#include "wine/library.h"
#include "msxml_private.h"
#include "msxml_private.h"
...
@@ -190,12 +189,12 @@ static void init_libxslt(void)
...
@@ -190,12 +189,12 @@ static void init_libxslt(void)
#ifdef SONAME_LIBXSLT
#ifdef SONAME_LIBXSLT
void
(
*
pxsltInit
)(
void
);
/* Missing in libxslt <= 1.1.14 */
void
(
*
pxsltInit
)(
void
);
/* Missing in libxslt <= 1.1.14 */
libxslt_handle
=
wine_dlopen
(
SONAME_LIBXSLT
,
RTLD_NOW
,
NULL
,
0
);
libxslt_handle
=
dlopen
(
SONAME_LIBXSLT
,
RTLD_NOW
);
if
(
!
libxslt_handle
)
if
(
!
libxslt_handle
)
return
;
return
;
#define LOAD_FUNCPTR(f, needed) \
#define LOAD_FUNCPTR(f, needed) \
if ((p##f =
wine_dlsym(libxslt_handle, #f, NULL, 0
)) == NULL) \
if ((p##f =
dlsym(libxslt_handle, #f
)) == NULL) \
if (needed) { WARN("Can't find symbol %s\n", #f); goto sym_not_found; }
if (needed) { WARN("Can't find symbol %s\n", #f); goto sym_not_found; }
LOAD_FUNCPTR
(
xsltInit
,
0
);
LOAD_FUNCPTR
(
xsltInit
,
0
);
LOAD_FUNCPTR
(
xsltApplyStylesheet
,
1
);
LOAD_FUNCPTR
(
xsltApplyStylesheet
,
1
);
...
@@ -225,7 +224,7 @@ static void init_libxslt(void)
...
@@ -225,7 +224,7 @@ static void init_libxslt(void)
return
;
return
;
sym_not_found:
sym_not_found:
wine_dlclose
(
libxslt_handle
,
NULL
,
0
);
dlclose
(
libxslt_handle
);
libxslt_handle
=
NULL
;
libxslt_handle
=
NULL
;
#endif
#endif
}
}
...
@@ -435,7 +434,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved)
...
@@ -435,7 +434,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved)
if
(
libxslt_handle
)
if
(
libxslt_handle
)
{
{
pxsltCleanupGlobals
();
pxsltCleanupGlobals
();
wine_dlclose
(
libxslt_handle
,
NULL
,
0
);
dlclose
(
libxslt_handle
);
}
}
#endif
#endif
/* Restore default Callbacks */
/* Restore default Callbacks */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment