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
12157fac
Commit
12157fac
authored
Apr 06, 2020
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
crypt32: Use standard dlopen() instead of the libwine wrappers.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
e39b3a2f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
pfx.c
dlls/crypt32/pfx.c
+4
-5
No files found.
dlls/crypt32/pfx.c
View file @
12157fac
...
@@ -31,7 +31,6 @@
...
@@ -31,7 +31,6 @@
#include "wine/debug.h"
#include "wine/debug.h"
#include "wine/heap.h"
#include "wine/heap.h"
#include "wine/library.h"
#include "wine/unicode.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL
(
crypt
);
WINE_DEFAULT_DEBUG_CHANNEL
(
crypt
);
...
@@ -72,14 +71,14 @@ BOOL gnutls_initialize(void)
...
@@ -72,14 +71,14 @@ BOOL gnutls_initialize(void)
{
{
int
ret
;
int
ret
;
if
(
!
(
libgnutls_handle
=
wine_dlopen
(
SONAME_LIBGNUTLS
,
RTLD_NOW
,
NULL
,
0
)))
if
(
!
(
libgnutls_handle
=
dlopen
(
SONAME_LIBGNUTLS
,
RTLD_NOW
)))
{
{
ERR_
(
winediag
)(
"failed to load libgnutls, no support for pfx import/export
\n
"
);
ERR_
(
winediag
)(
"failed to load libgnutls, no support for pfx import/export
\n
"
);
return
FALSE
;
return
FALSE
;
}
}
#define LOAD_FUNCPTR(f) \
#define LOAD_FUNCPTR(f) \
if (!(p##f =
wine_dlsym( libgnutls_handle, #f, NULL, 0
))) \
if (!(p##f =
dlsym( libgnutls_handle, #f
))) \
{ \
{ \
ERR( "failed to load %s\n", #f ); \
ERR( "failed to load %s\n", #f ); \
goto fail; \
goto fail; \
...
@@ -114,7 +113,7 @@ BOOL gnutls_initialize(void)
...
@@ -114,7 +113,7 @@ BOOL gnutls_initialize(void)
return
TRUE
;
return
TRUE
;
fail:
fail:
wine_dlclose
(
libgnutls_handle
,
NULL
,
0
);
dlclose
(
libgnutls_handle
);
libgnutls_handle
=
NULL
;
libgnutls_handle
=
NULL
;
return
FALSE
;
return
FALSE
;
}
}
...
@@ -122,7 +121,7 @@ fail:
...
@@ -122,7 +121,7 @@ fail:
void
gnutls_uninitialize
(
void
)
void
gnutls_uninitialize
(
void
)
{
{
pgnutls_global_deinit
();
pgnutls_global_deinit
();
wine_dlclose
(
libgnutls_handle
,
NULL
,
0
);
dlclose
(
libgnutls_handle
);
libgnutls_handle
=
NULL
;
libgnutls_handle
=
NULL
;
}
}
...
...
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