Alexandre Julliard : windowscodecs: Use standard dlopen() instead of the libwine wrappers.
Module: wine Branch: master Commit: 7cb1ac7ba297c94d177f968af28912618967bf4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cb1ac7ba297c94d177f968af... 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); }
participants (1)
-
Alexandre Julliard