Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
0f53fca3
Commit
0f53fca3
authored
Apr 06, 2020
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wineconsole: Use standard dlopen() instead of the libwine wrappers.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
5016716f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
8 deletions
+7
-8
curses.c
programs/wineconsole/curses.c
+7
-8
No files found.
programs/wineconsole/curses.c
View file @
0f53fca3
...
@@ -53,7 +53,6 @@
...
@@ -53,7 +53,6 @@
#include <winnls.h>
#include <winnls.h>
#include "winecon_private.h"
#include "winecon_private.h"
#include "wine/library.h"
#include "wine/debug.h"
#include "wine/debug.h"
#undef ERR
#undef ERR
#define ERR (-1)
#define ERR (-1)
...
@@ -139,7 +138,7 @@ static BOOL WCCURSES_bind_libcurses(void)
...
@@ -139,7 +138,7 @@ static BOOL WCCURSES_bind_libcurses(void)
static
const
char
ncname
[]
=
SONAME_LIBCURSES
;
static
const
char
ncname
[]
=
SONAME_LIBCURSES
;
#endif
#endif
nc_handle
=
wine_dlopen
(
ncname
,
RTLD_NOW
,
NULL
,
0
);
nc_handle
=
dlopen
(
ncname
,
RTLD_NOW
);
if
(
!
nc_handle
)
if
(
!
nc_handle
)
{
{
WINE_MESSAGE
(
"Wine cannot find the "
CURSES_NAME
" library (%s).
\n
"
,
WINE_MESSAGE
(
"Wine cannot find the "
CURSES_NAME
" library (%s).
\n
"
,
...
@@ -147,11 +146,11 @@ static BOOL WCCURSES_bind_libcurses(void)
...
@@ -147,11 +146,11 @@ static BOOL WCCURSES_bind_libcurses(void)
return
FALSE
;
return
FALSE
;
}
}
#define LOAD_FUNCPTR(f)
\
#define LOAD_FUNCPTR(f) \
if((p_##f =
wine_dlsym(nc_handle, #f, NULL, 0
)) == NULL) \
if((p_##f =
dlsym(nc_handle, #f
)) == NULL) \
{
\
{ \
WINE_WARN("Can't find symbol %s\n", #f);
\
WINE_WARN("Can't find symbol %s\n", #f); \
goto sym_not_found;
\
goto sym_not_found; \
}
}
LOAD_FUNCPTR
(
curs_set
)
LOAD_FUNCPTR
(
curs_set
)
...
@@ -200,7 +199,7 @@ sym_not_found:
...
@@ -200,7 +199,7 @@ sym_not_found:
"Wine cannot find certain functions that it needs inside the "
"Wine cannot find certain functions that it needs inside the "
CURSES_NAME
"
\n
library. To enable Wine to use "
CURSES_NAME
CURSES_NAME
"
\n
library. To enable Wine to use "
CURSES_NAME
" please upgrade your "
CURSES_NAME
"
\n
libraries
\n
"
);
" please upgrade your "
CURSES_NAME
"
\n
libraries
\n
"
);
wine_dlclose
(
nc_handle
,
NULL
,
0
);
dlclose
(
nc_handle
);
nc_handle
=
NULL
;
nc_handle
=
NULL
;
return
FALSE
;
return
FALSE
;
}
}
...
...
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