wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Alexandre Julliard : makefiles: Don't use standard libs for programs that specify -nodefaultlibs.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: c82c63f58a979441c42689a367d33802b93906fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c82c63f58a979441c42689a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 20:55:04 2020 +0200 makefiles: Don't use standard libs for programs that specify -nodefaultlibs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9b64f0fed4..c3169204f1 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3518,7 +3518,8 @@ static void output_programs( struct makefile *make ) struct strarray symlinks = get_expanded_file_local_var( make, make->programs.str[i], "SYMLINKS" ); if (!objs.count) objs = make->object_files; - strarray_addall( &all_libs, add_default_libraries( make, &deps )); + if (!strarray_exists( &all_libs, "-nodefaultlibs" )) + strarray_addall( &all_libs, add_default_libraries( make, &deps )); output( "%s:", obj_dir_path( make, program ) ); output_filenames_obj_dir( make, objs );

1 0

Alexandre Julliard : libwine: Make the dlopen() wrapper functions obsolete.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: b87256cd1db21a59484248a193b6ad12ca2853ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=b87256cd1db21a59484248a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:44:00 2020 +0200 libwine: Make the dlopen() wrapper functions obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/library.h | 3 - libs/port/stubs.c | 22 ---- libs/wine/loader.c | 265 ++++++++++++++++++++++++++----------------------- libs/wine/wine.map | 6 +- 4 files changed, 143 insertions(+), 153 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b87256cd1db21a594842…

1 0

Alexandre Julliard : wineconsole: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 0f53fca321d7d366b2bbc0580b721e8b79ea82f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f53fca321d7d366b2bbc058… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:43:43 2020 +0200 wineconsole: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/curses.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 6c35554d84..6fa669d150 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -53,7 +53,6 @@ #include <winnls.h> #include "winecon_private.h" -#include "wine/library.h" #include "wine/debug.h" #undef ERR #define ERR (-1) @@ -139,7 +138,7 @@ static BOOL WCCURSES_bind_libcurses(void) static const char ncname[] = SONAME_LIBCURSES; #endif - nc_handle = wine_dlopen(ncname, RTLD_NOW, NULL, 0); + nc_handle = dlopen(ncname, RTLD_NOW); if(!nc_handle) { WINE_MESSAGE("Wine cannot find the " CURSES_NAME " library (%s).\n", @@ -147,11 +146,11 @@ static BOOL WCCURSES_bind_libcurses(void) return FALSE; } -#define LOAD_FUNCPTR(f) \ - if((p_##f = wine_dlsym(nc_handle, #f, NULL, 0)) == NULL) \ - { \ - WINE_WARN("Can't find symbol %s\n", #f); \ - goto sym_not_found; \ +#define LOAD_FUNCPTR(f) \ + if((p_##f = dlsym(nc_handle, #f)) == NULL) \ + { \ + WINE_WARN("Can't find symbol %s\n", #f); \ + goto sym_not_found; \ } LOAD_FUNCPTR(curs_set) @@ -200,7 +199,7 @@ sym_not_found: "Wine cannot find certain functions that it needs inside the " CURSES_NAME "\nlibrary. To enable Wine to use " CURSES_NAME " please upgrade your " CURSES_NAME "\nlibraries\n"); - wine_dlclose(nc_handle, NULL, 0); + dlclose(nc_handle); nc_handle = NULL; return FALSE; }

1 0

Alexandre Julliard : winspool: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 5016716f6eccf26faac6ca6634eb521e9288a53e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5016716f6eccf26faac6ca66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:43:29 2020 +0200 winspool: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 0065801d90..593f091c2d 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -107,7 +107,6 @@ #define NONAMELESSSTRUCT #define NONAMELESSUNION -#include "wine/library.h" #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -887,13 +886,13 @@ static cups_ptype_t get_cups_printer_type( const cups_dest_t *dest ) static void load_cups(void) { - cupshandle = wine_dlopen( SONAME_LIBCUPS, RTLD_NOW, NULL, 0 ); + cupshandle = dlopen( SONAME_LIBCUPS, RTLD_NOW ); if (!cupshandle) return; TRACE("%p: %s loaded\n", cupshandle, SONAME_LIBCUPS); #define DO_FUNC(x) \ - p##x = wine_dlsym( cupshandle, #x, NULL, 0 ); \ + p##x = dlsym( cupshandle, #x ); \ if (!p##x) \ { \ ERR("failed to load symbol %s\n", #x); \ @@ -902,7 +901,7 @@ static void load_cups(void) } CUPS_FUNCS; #undef DO_FUNC -#define DO_FUNC(x) p##x = wine_dlsym( cupshandle, #x, NULL, 0 ) +#define DO_FUNC(x) p##x = dlsym( cupshandle, #x ) CUPS_OPT_FUNCS; #undef DO_FUNC }

1 0

Alexandre Julliard : winex11: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 7afa53c0f20aa40f0d13c81a7d20b523f62f99ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=7afa53c0f20aa40f0d13c81a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:43:15 2020 +0200 winex11: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 9 +++--- dlls/winex11.drv/mouse.c | 12 ++++---- dlls/winex11.drv/opengl.c | 12 ++++---- dlls/winex11.drv/vulkan.c | 49 ++++++++++++++++----------------- dlls/winex11.drv/wintab.c | 21 +++++++------- dlls/winex11.drv/x11drv_main.c | 39 ++++++++++++-------------- dlls/winex11.drv/xinerama.c | 7 ++--- dlls/winex11.drv/xrandr.c | 62 ++++++++++++++++++++---------------------- dlls/winex11.drv/xrender.c | 7 ++--- dlls/winex11.drv/xvidmode.c | 32 ++++++++++------------ 10 files changed, 117 insertions(+), 133 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7afa53c0f20aa40f0d13…

1 0

Alexandre Julliard : winemac: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 73effb1ab66606dcdcd3cff880ea36fa90388c8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=73effb1ab66606dcdcd3cff8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:41:34 2020 +0200 winemac: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/opengl.c | 16 +++++++--------- dlls/winemac.drv/vulkan.c | 7 +++---- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index c60a22719a..402dd8190c 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -27,7 +27,6 @@ #include "winuser.h" #include "winternl.h" #include "winnt.h" -#include "wine/library.h" #include "wine/debug.h" #include "wine/wgl.h" #include "wine/wgl_driver.h" @@ -4247,7 +4246,6 @@ static BOOL init_opengl(void) { static BOOL init_done = FALSE; unsigned int i; - char buffer[200]; if (init_done) return (opengl_handle != NULL); init_done = TRUE; @@ -4261,17 +4259,17 @@ static BOOL init_opengl(void) return FALSE; } - opengl_handle = wine_dlopen("/System/Library/Frameworks/OpenGL.framework/OpenGL", RTLD_LAZY|RTLD_LOCAL|RTLD_NOLOAD, buffer, sizeof(buffer)); + opengl_handle = dlopen("/System/Library/Frameworks/OpenGL.framework/OpenGL", RTLD_LAZY|RTLD_LOCAL|RTLD_NOLOAD); if (!opengl_handle) { - ERR("Failed to load OpenGL: %s\n", buffer); + ERR("Failed to load OpenGL: %s\n", dlerror()); ERR("OpenGL support is disabled.\n"); return FALSE; } for (i = 0; i < ARRAY_SIZE(opengl_func_names); i++) { - if (!(((void **)&opengl_funcs.gl)[i] = wine_dlsym(opengl_handle, opengl_func_names[i], NULL, 0))) + if (!(((void **)&opengl_funcs.gl)[i] = dlsym(opengl_handle, opengl_func_names[i]))) { ERR("%s not found in OpenGL, disabling.\n", opengl_func_names[i]); goto failed; @@ -4296,12 +4294,12 @@ static BOOL init_opengl(void) /* redirect some OpenGL extension functions */ #define REDIRECT(func) \ - do { if ((p##func = wine_dlsym(opengl_handle, #func, NULL, 0))) { opengl_funcs.ext.p_##func = macdrv_##func; } } while(0) + do { if ((p##func = dlsym(opengl_handle, #func))) { opengl_funcs.ext.p_##func = macdrv_##func; } } while(0) REDIRECT(glCopyColorTable); #undef REDIRECT if (gluCheckExtension((GLubyte*)"GL_APPLE_flush_render", (GLubyte*)gl_info.glExtensions)) - pglFlushRenderAPPLE = wine_dlsym(opengl_handle, "glFlushRenderAPPLE", NULL, 0); + pglFlushRenderAPPLE = dlsym(opengl_handle, "glFlushRenderAPPLE"); load_extensions(); if (!init_pixel_formats()) @@ -4310,7 +4308,7 @@ static BOOL init_opengl(void) return TRUE; failed: - wine_dlclose(opengl_handle, NULL, 0); + dlclose(opengl_handle); opengl_handle = NULL; return FALSE; } @@ -4479,7 +4477,7 @@ static PROC macdrv_wglGetProcAddress(const char *proc) void *ret; if (!strncmp(proc, "wgl", 3)) return NULL; - ret = wine_dlsym(opengl_handle, proc, NULL, 0); + ret = dlsym(opengl_handle, proc); if (ret) { if (TRACE_ON(wgl)) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 5d15eeda2b..dd92231d3e 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -33,7 +33,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/library.h" #define VK_NO_PROTOTYPES #define WINE_VK_HOST @@ -107,13 +106,13 @@ static void *vulkan_handle; static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) { - if (!(vulkan_handle = wine_dlopen(SONAME_LIBMOLTENVK, RTLD_NOW, NULL, 0))) + if (!(vulkan_handle = dlopen(SONAME_LIBMOLTENVK, RTLD_NOW))) { ERR("Failed to load %s\n", SONAME_LIBMOLTENVK); return TRUE; } -#define LOAD_FUNCPTR(f) if ((p##f = wine_dlsym(vulkan_handle, #f, NULL, 0)) == NULL) goto fail; +#define LOAD_FUNCPTR(f) if ((p##f = dlsym(vulkan_handle, #f)) == NULL) goto fail; LOAD_FUNCPTR(vkCreateInstance) LOAD_FUNCPTR(vkCreateSwapchainKHR) LOAD_FUNCPTR(vkCreateMacOSSurfaceMVK) @@ -137,7 +136,7 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) return TRUE; fail: - wine_dlclose(vulkan_handle, NULL, 0); + dlclose(vulkan_handle); vulkan_handle = NULL; return TRUE; }

1 0

Alexandre Julliard : winebus.sys: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 3760b7a9f8597f29f99e8018938ba9c2c524cc62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3760b7a9f8597f29f99e8018… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:40:34 2020 +0200 winebus.sys: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 0560e4bb12..95d5b9f9d0 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -42,7 +42,6 @@ #include "winternl.h" #include "ddk/wdm.h" #include "ddk/hidtypes.h" -#include "wine/library.h" #include "wine/debug.h" #include "wine/unicode.h" #include "hidusage.h" @@ -1101,7 +1100,7 @@ void sdl_driver_unload( void ) WaitForSingleObject(deviceloop_handle, INFINITE); CloseHandle(deviceloop_handle); - wine_dlclose(sdl_handle, NULL, 0); + dlclose(sdl_handle); } NTSTATUS sdl_driver_init(void) @@ -1114,12 +1113,12 @@ NTSTATUS sdl_driver_init(void) if (sdl_handle == NULL) { - sdl_handle = wine_dlopen(SONAME_LIBSDL2, RTLD_NOW, NULL, 0); + sdl_handle = dlopen(SONAME_LIBSDL2, RTLD_NOW); if (!sdl_handle) { WARN("could not load %s\n", SONAME_LIBSDL2); return STATUS_UNSUCCESSFUL; } -#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(sdl_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} +#define LOAD_FUNCPTR(f) if((p##f = dlsym(sdl_handle, #f)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} LOAD_FUNCPTR(SDL_GetError); LOAD_FUNCPTR(SDL_Init); LOAD_FUNCPTR(SDL_JoystickClose); @@ -1159,9 +1158,9 @@ NTSTATUS sdl_driver_init(void) LOAD_FUNCPTR(SDL_RegisterEvents); LOAD_FUNCPTR(SDL_PushEvent); #undef LOAD_FUNCPTR - pSDL_JoystickGetProduct = wine_dlsym(sdl_handle, "SDL_JoystickGetProduct", NULL, 0); - pSDL_JoystickGetProductVersion = wine_dlsym(sdl_handle, "SDL_JoystickGetProductVersion", NULL, 0); - pSDL_JoystickGetVendor = wine_dlsym(sdl_handle, "SDL_JoystickGetVendor", NULL, 0); + pSDL_JoystickGetProduct = dlsym(sdl_handle, "SDL_JoystickGetProduct"); + pSDL_JoystickGetProductVersion = dlsym(sdl_handle, "SDL_JoystickGetProductVersion"); + pSDL_JoystickGetVendor = dlsym(sdl_handle, "SDL_JoystickGetVendor"); } map_controllers = check_bus_option(&controller_mode, 1); @@ -1189,7 +1188,7 @@ NTSTATUS sdl_driver_init(void) CloseHandle(events[1]); sym_not_found: - wine_dlclose(sdl_handle, NULL, 0); + dlclose(sdl_handle); sdl_handle = NULL; return STATUS_UNSUCCESSFUL; }

1 0

Alexandre Julliard : wineandroid: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 57d5cf0345bb5b5ec0d3e1a649058ab54bbb2a0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=57d5cf0345bb5b5ec0d3e1a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:40:19 2020 +0200 wineandroid: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/init.c | 19 ++++++++----------- dlls/wineandroid.drv/mmdevdrv.c | 8 +++----- dlls/wineandroid.drv/opengl.c | 16 +++++++--------- 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index f02b163831..7b2850e452 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -32,7 +32,6 @@ #include "winreg.h" #include "android.h" #include "wine/server.h" -#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(android); @@ -444,7 +443,7 @@ static const JNINativeMethod methods[] = #define DECL_FUNCPTR(f) typeof(f) * p##f = NULL #define LOAD_FUNCPTR(lib, func) do { \ - if ((p##func = wine_dlsym( lib, #func, NULL, 0 )) == NULL) \ + if ((p##func = dlsym( lib, #func )) == NULL) \ { ERR( "can't find symbol %s\n", #func); return; } \ } while(0) @@ -567,9 +566,8 @@ static void load_hardware_libs(void) const struct hw_module_t *module; int ret; void *libhardware; - char error[256]; - if ((libhardware = wine_dlopen( "libhardware.so", RTLD_GLOBAL, error, sizeof(error) ))) + if ((libhardware = dlopen( "libhardware.so", RTLD_GLOBAL ))) { LOAD_FUNCPTR( libhardware, hw_get_module ); } @@ -578,9 +576,9 @@ static void load_hardware_libs(void) /* Android >= N disallows loading libhardware, so we load libandroid (which imports * libhardware), and then we can find libhardware in the list of loaded libraries. */ - if (!wine_dlopen( "libandroid.so", RTLD_GLOBAL, error, sizeof(error) )) + if (!dlopen( "libandroid.so", RTLD_GLOBAL )) { - ERR( "failed to load libandroid.so: %s\n", error ); + ERR( "failed to load libandroid.so: %s\n", dlerror() ); return; } dl_iterate_phdr( enum_libs, 0 ); @@ -603,16 +601,15 @@ static void load_hardware_libs(void) static void load_android_libs(void) { void *libandroid, *liblog; - char error[1024]; - if (!(libandroid = wine_dlopen( "libandroid.so", RTLD_GLOBAL, error, sizeof(error) ))) + if (!(libandroid = dlopen( "libandroid.so", RTLD_GLOBAL ))) { - ERR( "failed to load libandroid.so: %s\n", error ); + ERR( "failed to load libandroid.so: %s\n", dlerror() ); return; } - if (!(liblog = wine_dlopen( "liblog.so", RTLD_GLOBAL, error, sizeof(error) ))) + if (!(liblog = dlopen( "liblog.so", RTLD_GLOBAL ))) { - ERR( "failed to load liblog.so: %s\n", error ); + ERR( "failed to load liblog.so: %s\n", dlerror() ); return; } LOAD_FUNCPTR( liblog, __android_log_print ); diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 608e16a7a7..b4d8564256 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -46,7 +46,6 @@ #include "wine/debug.h" #include "wine/unicode.h" #include "wine/list.h" -#include "wine/library.h" #include "ole2.h" #include "mmdeviceapi.h" @@ -237,7 +236,7 @@ static inline SessionMgr *impl_from_IAudioSessionManager2(IAudioSessionManager2 } #define LOAD_FUNCPTR(lib, func) do { \ - if ((p##func = wine_dlsym( lib, #func, NULL, 0 )) == NULL) \ + if ((p##func = dlsym( lib, #func )) == NULL) \ { ERR( "can't find symbol %s\n", #func); return FALSE; } \ } while(0) @@ -246,11 +245,10 @@ static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; static BOOL WINAPI load_opensles( INIT_ONCE *once, void *param, void **context ) { void *libopensles; - char error[1024]; - if (!(libopensles = wine_dlopen( "libOpenSLES.so", RTLD_GLOBAL, error, sizeof(error) ))) + if (!(libopensles = dlopen( "libOpenSLES.so", RTLD_GLOBAL ))) { - ERR( "failed to load libOpenSLES.so: %s\n", error ); + ERR( "failed to load libOpenSLES.so: %s\n", dlerror() ); return FALSE; } LOAD_FUNCPTR( libopensles, slCreateEngine ); diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index 77c88f7817..93e77c423b 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -42,7 +42,6 @@ #include "wine/wgl.h" #undef GLAPIENTRY #include "wine/wgl_driver.h" -#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(android); @@ -655,11 +654,11 @@ static void init_extensions(void) /* load standard functions and extensions exported from the OpenGL library */ -#define USE_GL_FUNC(func) if ((ptr = wine_dlsym( opengl_handle, #func, NULL, 0 ))) egl_funcs.gl.p_##func = ptr; +#define USE_GL_FUNC(func) if ((ptr = dlsym( opengl_handle, #func ))) egl_funcs.gl.p_##func = ptr; ALL_WGL_FUNCS #undef USE_GL_FUNC -#define LOAD_FUNCPTR(func) egl_funcs.ext.p_##func = wine_dlsym( opengl_handle, #func, NULL, 0 ) +#define LOAD_FUNCPTR(func) egl_funcs.ext.p_##func = dlsym( opengl_handle, #func ) LOAD_FUNCPTR( glActiveShaderProgram ); LOAD_FUNCPTR( glActiveTexture ); LOAD_FUNCPTR( glAttachShader ); @@ -949,24 +948,23 @@ static BOOL egl_init(void) static int retval = -1; EGLConfig *configs; EGLint major, minor, count, i, pass; - char buffer[200]; if (retval != -1) return retval; retval = 0; - if (!(egl_handle = wine_dlopen( SONAME_LIBEGL, RTLD_NOW|RTLD_GLOBAL, buffer, sizeof(buffer) ))) + if (!(egl_handle = dlopen( SONAME_LIBEGL, RTLD_NOW|RTLD_GLOBAL ))) { - ERR( "failed to load %s: %s\n", SONAME_LIBEGL, buffer ); + ERR( "failed to load %s: %s\n", SONAME_LIBEGL, dlerror() ); return FALSE; } - if (!(opengl_handle = wine_dlopen( SONAME_LIBGLESV2, RTLD_NOW|RTLD_GLOBAL, buffer, sizeof(buffer) ))) + if (!(opengl_handle = dlopen( SONAME_LIBGLESV2, RTLD_NOW|RTLD_GLOBAL ))) { - ERR( "failed to load %s: %s\n", SONAME_LIBGLESV2, buffer ); + ERR( "failed to load %s: %s\n", SONAME_LIBGLESV2, dlerror() ); return FALSE; } #define LOAD_FUNCPTR(func) do { \ - if (!(p_##func = wine_dlsym( egl_handle, #func, NULL, 0 ))) \ + if (!(p_##func = dlsym( egl_handle, #func ))) \ { ERR( "can't find symbol %s\n", #func); return FALSE; } \ } while(0) LOAD_FUNCPTR( eglCreateContext );

1 0

Alexandre Julliard : windowscodecs: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 7cb1ac7ba297c94d177f968af28912618967bf4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cb1ac7ba297c94d177f968a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:39:54 2020 +0200 windowscodecs: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/icnsformat.c | 1 - dlls/windowscodecs/jpegformat.c | 5 ++--- dlls/windowscodecs/pngformat.c | 5 ++--- dlls/windowscodecs/tgaformat.c | 1 - dlls/windowscodecs/tiffformat.c | 9 ++++----- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index 5b94906e80..c74e4b24d7 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -86,7 +86,6 @@ #include "wincodecs_private.h" #include "wine/debug.h" -#include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 9460e6913f..e04e914cda 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -52,7 +52,6 @@ #include "wine/heap.h" #include "wine/debug.h" -#include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); @@ -86,10 +85,10 @@ MAKE_FUNCPTR(jpeg_write_scanlines); static void *load_libjpeg(void) { - if((libjpeg_handle = wine_dlopen(SONAME_LIBJPEG, RTLD_NOW, NULL, 0)) != NULL) { + if((libjpeg_handle = dlopen(SONAME_LIBJPEG, RTLD_NOW)) != NULL) { #define LOAD_FUNCPTR(f) \ - if((p##f = wine_dlsym(libjpeg_handle, #f, NULL, 0)) == NULL) { \ + if((p##f = dlsym(libjpeg_handle, #f)) == NULL) { \ libjpeg_handle = NULL; \ return NULL; \ } diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 207a81d4d2..3cf47b4211 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -36,7 +36,6 @@ #include "wincodecs_private.h" #include "wine/debug.h" -#include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); @@ -360,10 +359,10 @@ static void *load_libpng(void) EnterCriticalSection(&init_png_cs); - if(!libpng_handle && (libpng_handle = wine_dlopen(SONAME_LIBPNG, RTLD_NOW, NULL, 0)) != NULL) { + if(!libpng_handle && (libpng_handle = dlopen(SONAME_LIBPNG, RTLD_NOW)) != NULL) { #define LOAD_FUNCPTR(f) \ - if((p##f = wine_dlsym(libpng_handle, #f, NULL, 0)) == NULL) { \ + if((p##f = dlsym(libpng_handle, #f)) == NULL) { \ libpng_handle = NULL; \ LeaveCriticalSection(&init_png_cs); \ return NULL; \ diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index 72c9baa016..b572d8f686 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -30,7 +30,6 @@ #include "wincodecs_private.h" #include "wine/debug.h" -#include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 60592e0cb8..a4c441e706 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -37,7 +37,6 @@ #include "wincodecs_private.h" #include "wine/debug.h" -#include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); @@ -90,13 +89,13 @@ static void *load_libtiff(void) EnterCriticalSection(&init_tiff_cs); if (!libtiff_handle && - (libtiff_handle = wine_dlopen(SONAME_LIBTIFF, RTLD_NOW, NULL, 0)) != NULL) + (libtiff_handle = dlopen(SONAME_LIBTIFF, RTLD_NOW)) != NULL) { void * (*pTIFFSetWarningHandler)(void *); void * (*pTIFFSetWarningHandlerExt)(void *); #define LOAD_FUNCPTR(f) \ - if((p##f = wine_dlsym(libtiff_handle, #f, NULL, 0)) == NULL) { \ + if((p##f = dlsym(libtiff_handle, #f)) == NULL) { \ ERR("failed to load symbol %s\n", #f); \ libtiff_handle = NULL; \ LeaveCriticalSection(&init_tiff_cs); \ @@ -117,9 +116,9 @@ static void *load_libtiff(void) LOAD_FUNCPTR(TIFFWriteScanline); #undef LOAD_FUNCPTR - if ((pTIFFSetWarningHandler = wine_dlsym(libtiff_handle, "TIFFSetWarningHandler", NULL, 0))) + if ((pTIFFSetWarningHandler = dlsym(libtiff_handle, "TIFFSetWarningHandler"))) pTIFFSetWarningHandler(NULL); - if ((pTIFFSetWarningHandlerExt = wine_dlsym(libtiff_handle, "TIFFSetWarningHandlerExt", NULL, 0))) + if ((pTIFFSetWarningHandlerExt = dlsym(libtiff_handle, "TIFFSetWarningHandlerExt"))) pTIFFSetWarningHandlerExt(NULL); }

1 0

Alexandre Julliard : user32: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: b88730d8af0c08e4e5e67b7108313ebc1ab051f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b88730d8af0c08e4e5e67b71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:39:31 2020 +0200 user32: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 6413d22d03..eca6dc58c3 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -48,7 +48,6 @@ #include "wine/list.h" #include "wine/unicode.h" #include "wine/debug.h" -#include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(cursor); WINE_DECLARE_DEBUG_CHANNEL(icon); @@ -148,13 +147,13 @@ static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; static BOOL WINAPI load_libpng( INIT_ONCE *once, void *param, void **context ) { - if (!(libpng_handle = wine_dlopen(SONAME_LIBPNG, RTLD_NOW, NULL, 0))) + if (!(libpng_handle = dlopen( SONAME_LIBPNG, RTLD_NOW ))) { WARN( "failed to load %s\n", SONAME_LIBPNG ); return TRUE; } #define LOAD_FUNCPTR(f) \ - if ((p##f = wine_dlsym(libpng_handle, #f, NULL, 0)) == NULL) \ + if ((p##f = dlsym(libpng_handle, #f)) == NULL) \ { \ WARN( "%s not found in %s\n", #f, SONAME_LIBPNG ); \ libpng_handle = NULL; \

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2020