April 2020 - Wine-Commits - list.winehq.org

Alexandre Julliard : winex11: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard April 7, 2020

April 7, 2020

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 : secur32: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 55434d4539c2eb66ec4051d2499a1ea816c5aeff URL: https://source.winehq.org/git/wine.git/?a=commit;h=55434d4539c2eb66ec4051d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:39:18 2020 +0200 secur32: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 15 +++++++-------- dlls/secur32/schannel_macosx.c | 1 - 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 8ac5bee9ff..6217080240 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -40,7 +40,6 @@ #include "secur32_priv.h" #include "wine/debug.h" -#include "wine/library.h" #include "wine/unicode.h" #if defined(SONAME_LIBGNUTLS) && !defined(HAVE_SECURITY_SECURITY_H) @@ -873,7 +872,7 @@ BOOL schan_imp_init(void) { int ret; - libgnutls_handle = wine_dlopen(SONAME_LIBGNUTLS, RTLD_NOW, NULL, 0); + libgnutls_handle = dlopen(SONAME_LIBGNUTLS, RTLD_NOW); if (!libgnutls_handle) { ERR_(winediag)("Failed to load libgnutls, secure connections will not be available.\n"); @@ -881,7 +880,7 @@ BOOL schan_imp_init(void) } #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); \ goto fail; \ @@ -926,17 +925,17 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_x509_privkey_deinit) #undef LOAD_FUNCPTR - if (!(pgnutls_cipher_get_block_size = wine_dlsym(libgnutls_handle, "gnutls_cipher_get_block_size", NULL, 0))) + if (!(pgnutls_cipher_get_block_size = dlsym(libgnutls_handle, "gnutls_cipher_get_block_size"))) { WARN("gnutls_cipher_get_block_size not found\n"); pgnutls_cipher_get_block_size = compat_cipher_get_block_size; } - if (!(pgnutls_privkey_export_x509 = wine_dlsym(libgnutls_handle, "gnutls_privkey_export_x509", NULL, 0))) + if (!(pgnutls_privkey_export_x509 = dlsym(libgnutls_handle, "gnutls_privkey_export_x509"))) { WARN("gnutls_privkey_export_x509 not found\n"); pgnutls_privkey_export_x509 = compat_gnutls_privkey_export_x509; } - if (!(pgnutls_privkey_import_rsa_raw = wine_dlsym(libgnutls_handle, "gnutls_privkey_import_rsa_raw", NULL, 0))) + if (!(pgnutls_privkey_import_rsa_raw = dlsym(libgnutls_handle, "gnutls_privkey_import_rsa_raw"))) { WARN("gnutls_privkey_import_rsa_raw not found\n"); pgnutls_privkey_import_rsa_raw = compat_gnutls_privkey_import_rsa_raw; @@ -959,7 +958,7 @@ BOOL schan_imp_init(void) return TRUE; fail: - wine_dlclose(libgnutls_handle, NULL, 0); + dlclose(libgnutls_handle); libgnutls_handle = NULL; return FALSE; } @@ -967,7 +966,7 @@ fail: void schan_imp_deinit(void) { pgnutls_global_deinit(); - wine_dlclose(libgnutls_handle, NULL, 0); + dlclose(libgnutls_handle); libgnutls_handle = NULL; } diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index d06267773a..f86a561cf8 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -38,7 +38,6 @@ #include "schannel.h" #include "secur32_priv.h" #include "wine/debug.h" -#include "wine/library.h" #ifdef HAVE_SECURITY_SECURITY_H

1 0

Alexandre Julliard : qcap: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 0c43293862d2db7a17000bfbce03edc56081585a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c43293862d2db7a17000bfb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:38:50 2020 +0200 qcap: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 0d7e176d3d..6fe92d2d0a 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -58,7 +58,6 @@ #include "vfwmsgs.h" #include "amvideo.h" #include "wine/debug.h" -#include "wine/library.h" #include "qcap_main.h" #include "capture.h" @@ -81,12 +80,12 @@ static BOOL video_init(void) if (video_lib) return TRUE; - if (!(video_lib = wine_dlopen(SONAME_LIBV4L2, RTLD_NOW, NULL, 0))) + if (!(video_lib = dlopen(SONAME_LIBV4L2, RTLD_NOW))) return FALSE; - video_open = wine_dlsym(video_lib, "v4l2_open", NULL, 0); - video_close = wine_dlsym(video_lib, "v4l2_close", NULL, 0); - video_ioctl = wine_dlsym(video_lib, "v4l2_ioctl", NULL, 0); - video_read = wine_dlsym(video_lib, "v4l2_read", NULL, 0); + video_open = dlsym(video_lib, "v4l2_open"); + video_close = dlsym(video_lib, "v4l2_close"); + video_ioctl = dlsym(video_lib, "v4l2_ioctl"); + video_read = dlsym(video_lib, "v4l2_read"); return TRUE; #else

1 0

Alexandre Julliard : sane.ds: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 553a134f0620e90f2ccbe41a2bccc9883a9146eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=553a134f0620e90f2ccbe41a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:39:03 2020 +0200 sane.ds: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sane.ds/sane_main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 0cf211d098..1df6cb9ba2 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -26,7 +26,6 @@ #include "sane_i.h" #include "wine/debug.h" -#include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(twain); @@ -59,22 +58,22 @@ static void *libsane_handle; static void close_libsane(void *h) { if (h) - wine_dlclose(h, NULL, 0); + dlclose(h); } static void *open_libsane(void) { void *h; - h = wine_dlopen(SONAME_LIBSANE, RTLD_GLOBAL | RTLD_NOW, NULL, 0); + h = dlopen(SONAME_LIBSANE, RTLD_GLOBAL | RTLD_NOW); if (!h) { - WARN("dlopen(%s) failed\n", SONAME_LIBSANE); + WARN("failed to load %s; %s\n", SONAME_LIBSANE, dlerror()); return NULL; } #define LOAD_FUNCPTR(f) \ - if((p##f = wine_dlsym(h, #f, NULL, 0)) == NULL) { \ + if((p##f = dlsym(h, #f)) == NULL) { \ close_libsane(h); \ ERR("Could not dlsym %s\n", #f); \ return NULL; \

1 0

Alexandre Julliard : winebus.sys: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard April 7, 2020

April 7, 2020

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

Zhiyi Zhang : dxgi/tests: Fix uninitialized variable warnings.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 03885ef4a1dca586c202ca168b70eebe06e718dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=03885ef4a1dca586c202ca16… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 6 19:53:26 2020 +0800 dxgi/tests: Fix uninitialized variable warnings. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index cc49c7b2ae..e003b19d94 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2123,7 +2123,7 @@ static void test_get_containing_output(void) {-49, -50}, {-50, -50}, {-51, -50}, {-49, -51}, {-50, -51}, {-51, -51}, }; - unsigned int x, y; + unsigned int x = 0, y = 0; switch (i) {

1 0

Chip Davis : d3d11: Introduce a function to convert a D3D feature level to a D3D10.1 feature level.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: e35a62c5fa4003b40e4a5758e06a374632df41fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e35a62c5fa4003b40e4a5758… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Apr 6 12:51:34 2020 -0500 d3d11: Introduce a function to convert a D3D feature level to a D3D10.1 feature level. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 6f8257078d..7544bc86f4 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -5833,13 +5833,18 @@ static void STDMETHODCALLTYPE d3d10_device_GetTextFilterSize(ID3D10Device1 *ifac FIXME("iface %p, width %p, height %p stub!\n", iface, width, height); } +static D3D10_FEATURE_LEVEL1 d3d10_feature_level1_from_d3d_feature_level(D3D_FEATURE_LEVEL level) +{ + return (D3D10_FEATURE_LEVEL1)level; +} + static D3D10_FEATURE_LEVEL1 STDMETHODCALLTYPE d3d10_device_GetFeatureLevel(ID3D10Device1 *iface) { struct d3d_device *device = impl_from_ID3D10Device(iface); TRACE("iface %p.\n", iface); - return device->feature_level; + return d3d10_feature_level1_from_d3d_feature_level(device->feature_level); } static const struct ID3D10Device1Vtbl d3d10_device1_vtbl =

1 0

Alexandre Julliard : makefiles: Don't use standard libs for programs that specify -nodefaultlibs.
by Alexandre Julliard April 7, 2020

April 7, 2020

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 : user32: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard April 7, 2020

April 7, 2020

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

Alexandre Julliard : windowscodecs: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard April 7, 2020

April 7, 2020

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