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

Dmitry Timoshkov : adsldp: Recognize ADS_SEARCHPREF_PAGESIZE in IDirectorySearch::SetSearchPreference().
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 5c8f688f1a332af736197aa098e36c049cba968d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c8f688f1a332af736197aa0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 6 18:11:51 2020 +0800 adsldp: Recognize ADS_SEARCHPREF_PAGESIZE in IDirectorySearch::SetSearchPreference(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 2b5f621fba..952e4931d4 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -400,6 +400,7 @@ typedef struct struct { ADS_SCOPEENUM scope; + int pagesize; } search; } LDAP_namespace; @@ -1214,6 +1215,19 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S break; } + case ADS_SEARCHPREF_PAGESIZE: + if (prefs[i].vValue.dwType != ADSTYPE_INTEGER) + { + FIXME("ADS_SEARCHPREF_PAGESIZE: not supportd dwType %d\n", prefs[i].vValue.dwType); + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; + break; + } + + TRACE("PAGESIZE: %d\n", prefs[i].vValue.u.Integer); + ldap->search.pagesize = prefs[i].vValue.u.Integer; + prefs[i].dwStatus = ADS_STATUS_S_OK; + break; + default: FIXME("pref %d, type %u: stub\n", prefs[i].dwSearchPref, prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREF; @@ -1713,6 +1727,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->attrs_count_allocated = 0; ldap->attrs = NULL; ldap->search.scope = ADS_SCOPE_SUBTREE; + ldap->search.pagesize = 0; ldap->at = NULL; ldap->at_single_count = 0; ldap->at_multiple_count = 0;

1 0

Dmitry Timoshkov : adsldp: Recognize ADS_SEARCHPREF_CACHE_RESULTS in IDirectorySearch::SetSearchPreference().
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 220b871236517adb27f497355b428bdc62f47431 URL: https://source.winehq.org/git/wine.git/?a=commit;h=220b871236517adb27f49735… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 6 18:11:57 2020 +0800 adsldp: Recognize ADS_SEARCHPREF_CACHE_RESULTS in IDirectorySearch::SetSearchPreference(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 952e4931d4..f2773262a6 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -401,6 +401,7 @@ typedef struct { ADS_SCOPEENUM scope; int pagesize; + BOOL cache_results; } search; } LDAP_namespace; @@ -1228,6 +1229,19 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S prefs[i].dwStatus = ADS_STATUS_S_OK; break; + case ADS_SEARCHPREF_CACHE_RESULTS: + if (prefs[i].vValue.dwType != ADSTYPE_BOOLEAN) + { + FIXME("ADS_SEARCHPREF_CACHE_RESULTS: not supportd dwType %d\n", prefs[i].vValue.dwType); + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; + break; + } + + TRACE("CACHE_RESULTS: %d\n", prefs[i].vValue.u.Boolean); + ldap->search.cache_results = prefs[i].vValue.u.Boolean; + prefs[i].dwStatus = ADS_STATUS_S_OK; + break; + default: FIXME("pref %d, type %u: stub\n", prefs[i].dwSearchPref, prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREF; @@ -1728,6 +1742,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->attrs = NULL; ldap->search.scope = ADS_SCOPE_SUBTREE; ldap->search.pagesize = 0; + ldap->search.cache_results = TRUE; ldap->at = NULL; ldap->at_single_count = 0; ldap->at_multiple_count = 0;

1 0

Dmitry Timoshkov : adsldp/tests: Remove no longer needed goto.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 8a3de59fcb5c0bb8b3cfac559c1eead10cd43de6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a3de59fcb5c0bb8b3cfac55… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 6 18:12:04 2020 +0800 adsldp/tests: Remove no longer needed goto. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/tests/ldap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 208a9fa2fe..e76bd2e0b6 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -505,7 +505,6 @@ todo_wine hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, &sh); ok(hr == S_OK, "got %#x\n", hr); - if (hr != S_OK) goto fail; hr = IDirectorySearch_GetNextRow(ds, sh); ok(hr == S_OK, "got %#x\n", hr); @@ -517,7 +516,6 @@ todo_wine ok(hr == S_OK, "got %#x\n", hr); IDirectorySearch_Release(ds); -fail: IDirectoryObject_Release(dirobj); }

1 0

Nikolay Sivov : mfreadwrite: Implement MF_SOURCE_READER_ANY_STREAM for synchronous case.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: 978d497d95d40f1189d663c7a9cdd5aa065c7905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=978d497d95d40f1189d663c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 6 17:19:29 2020 +0300 mfreadwrite: Implement MF_SOURCE_READER_ANY_STREAM for synchronous case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 146 +++++++++++++++++++++++++--------------- dlls/mfreadwrite/tests/mfplat.c | 43 +++++++----- 2 files changed, 119 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=978d497d95d40f1189d6…

1 0

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

06 Apr '20

Module: wine Branch: master Commit: 907aaf9e72714293909351648827e7c5aebc12a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=907aaf9e7271429390935164… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:46:10 2020 +0200 gdi32: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/opengl.c | 12 +++++------- dlls/gdi32/freetype.c | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c index 09bb43448d..1c6d930230 100644 --- a/dlls/gdi32/dibdrv/opengl.c +++ b/dlls/gdi32/dibdrv/opengl.c @@ -24,7 +24,6 @@ #include "gdi_private.h" #include "dibdrv.h" -#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dib); @@ -99,22 +98,21 @@ static BOOL init_opengl(void) { static BOOL init_done = FALSE; static void *osmesa_handle; - char buffer[200]; unsigned int i; if (init_done) return (osmesa_handle != NULL); init_done = TRUE; - osmesa_handle = wine_dlopen( SONAME_LIBOSMESA, RTLD_NOW, buffer, sizeof(buffer) ); + osmesa_handle = dlopen( SONAME_LIBOSMESA, RTLD_NOW ); if (osmesa_handle == NULL) { - ERR( "Failed to load OSMesa: %s\n", buffer ); + ERR( "Failed to load OSMesa: %s\n", dlerror() ); return FALSE; } -#define LOAD_FUNCPTR(f) do if (!(p##f = wine_dlsym( osmesa_handle, #f, buffer, sizeof(buffer) ))) \ +#define LOAD_FUNCPTR(f) do if (!(p##f = dlsym( osmesa_handle, #f ))) \ { \ - ERR( "%s not found in %s (%s), disabling.\n", #f, SONAME_LIBOSMESA, buffer ); \ + ERR( "%s not found in %s (%s), disabling.\n", #f, SONAME_LIBOSMESA, dlerror() ); \ goto failed; \ } while(0) @@ -137,7 +135,7 @@ static BOOL init_opengl(void) return TRUE; failed: - wine_dlclose( osmesa_handle, NULL, 0 ); + dlclose( osmesa_handle ); osmesa_handle = NULL; return FALSE; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3ed093701d..4c4b27aa18 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2787,7 +2787,7 @@ static UINT parse_aa_pattern( FcPattern *pattern ) static void init_fontconfig(void) { - void *fc_handle = wine_dlopen(SONAME_LIBFONTCONFIG, RTLD_NOW, NULL, 0); + void *fc_handle = dlopen(SONAME_LIBFONTCONFIG, RTLD_NOW); if (!fc_handle) { @@ -2795,7 +2795,7 @@ static void init_fontconfig(void) return; } -#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(fc_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); return;} +#define LOAD_FUNCPTR(f) if((p##f = dlsym(fc_handle, #f)) == NULL){WARN("Can't find symbol %s\n", #f); return;} LOAD_FUNCPTR(FcConfigSubstitute); LOAD_FUNCPTR(FcDefaultSubstitute); LOAD_FUNCPTR(FcFontList); @@ -4151,7 +4151,7 @@ static void update_font_info(void) static BOOL init_freetype(void) { - ft_handle = wine_dlopen(SONAME_LIBFREETYPE, RTLD_NOW, NULL, 0); + ft_handle = dlopen(SONAME_LIBFREETYPE, RTLD_NOW); if(!ft_handle) { WINE_MESSAGE( "Wine cannot find the FreeType font library. To enable Wine to\n" @@ -4161,7 +4161,7 @@ static BOOL init_freetype(void) return FALSE; } -#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(ft_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(ft_handle, #f)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} LOAD_FUNCPTR(FT_Done_Face) LOAD_FUNCPTR(FT_Get_Char_Index) @@ -4193,16 +4193,16 @@ static BOOL init_freetype(void) LOAD_FUNCPTR(FT_Vector_Unit) #undef LOAD_FUNCPTR /* Don't warn if these ones are missing */ - pFT_Outline_Embolden = wine_dlsym(ft_handle, "FT_Outline_Embolden", NULL, 0); - pFT_Get_TrueType_Engine_Type = wine_dlsym(ft_handle, "FT_Get_TrueType_Engine_Type", NULL, 0); + pFT_Outline_Embolden = dlsym(ft_handle, "FT_Outline_Embolden"); + pFT_Get_TrueType_Engine_Type = dlsym(ft_handle, "FT_Get_TrueType_Engine_Type"); #ifdef FT_LCD_FILTER_H - pFT_Library_SetLcdFilter = wine_dlsym(ft_handle, "FT_Library_SetLcdFilter", NULL, 0); + pFT_Library_SetLcdFilter = dlsym(ft_handle, "FT_Library_SetLcdFilter"); #endif - pFT_Property_Set = wine_dlsym(ft_handle, "FT_Property_Set", NULL, 0); + pFT_Property_Set = dlsym(ft_handle, "FT_Property_Set"); if(pFT_Init_FreeType(&library) != 0) { ERR("Can't init FreeType library\n"); - wine_dlclose(ft_handle, NULL, 0); + dlclose(ft_handle); ft_handle = NULL; return FALSE; } @@ -4229,7 +4229,7 @@ sym_not_found: "font library. To enable Wine to use TrueType fonts please upgrade\n" "FreeType to at least version 2.1.4.\n" "http://www.freetype.org\n"); - wine_dlclose(ft_handle, NULL, 0); + dlclose(ft_handle); ft_handle = NULL; return FALSE; }

1 0

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

06 Apr '20

Module: wine Branch: master Commit: 55e1e0c525022b2bcc18d0d4862df56195a6645a URL: https://source.winehq.org/git/wine.git/?a=commit;h=55e1e0c525022b2bcc18d0d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:46:18 2020 +0200 glu32: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/glu.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c index 8f0a360ff9..827b1012bb 100644 --- a/dlls/glu32/glu.c +++ b/dlls/glu32/glu.c @@ -27,7 +27,6 @@ #include "wine/wgl.h" #include "wine/glu.h" -#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(glu); @@ -116,12 +115,10 @@ static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; static BOOL WINAPI load_libglu( INIT_ONCE *once, void *param, void **context ) { #ifdef SONAME_LIBGLU - char error[256]; - - if ((libglu_handle = wine_dlopen( SONAME_LIBGLU, RTLD_NOW, error, sizeof(error) ))) + if ((libglu_handle = dlopen( SONAME_LIBGLU, RTLD_NOW ))) TRACE( "loaded %s\n", SONAME_LIBGLU ); else - ERR( "Failed to load %s: %s\n", SONAME_LIBGLU, error ); + ERR( "Failed to load %s: %s\n", SONAME_LIBGLU, dlerror() ); #else ERR( "libGLU is needed but support was not included at build time\n" ); #endif @@ -133,7 +130,7 @@ static void *load_glufunc( const char *name ) void *ret; if (!InitOnceExecuteOnce( &init_once, load_libglu, NULL, NULL )) return NULL; - if (!(ret = wine_dlsym( libglu_handle, name, NULL, 0 ))) ERR( "Can't find %s\n", name ); + if (!(ret = dlsym( libglu_handle, name ))) ERR( "Can't find %s\n", name ); return ret; }

1 0

Alexandre Julliard : gphoto2.ds: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: a18462424fd6cc20fefb364587611d2a86598a2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a18462424fd6cc20fefb3645… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:46:38 2020 +0200 gphoto2.ds: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gphoto2.ds/ds_image.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c index 32f526782e..e5df69f4a6 100644 --- a/dlls/gphoto2.ds/ds_image.c +++ b/dlls/gphoto2.ds/ds_image.c @@ -27,7 +27,6 @@ #include "gphoto2_i.h" #include "wingdi.h" #include "winuser.h" -#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(twain); @@ -46,10 +45,10 @@ MAKE_FUNCPTR(jpeg_destroy_decompress); 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; \ }

1 0

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

06 Apr '20

Module: wine Branch: master Commit: 64c89517250330618fddb4db75b1a84917cc0125 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64c89517250330618fddb4db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:47:19 2020 +0200 kerberos: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index f426290673..44d6b86e01 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -44,7 +44,6 @@ #include "ntsecpkg.h" #include "winternl.h" #include "wine/heap.h" -#include "wine/library.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -119,14 +118,14 @@ MAKE_FUNCPTR(krb5_unparse_name_flags); static void load_krb5(void) { - if (!(libkrb5_handle = wine_dlopen(SONAME_LIBKRB5, RTLD_NOW, NULL, 0))) + if (!(libkrb5_handle = dlopen(SONAME_LIBKRB5, RTLD_NOW))) { WARN("Failed to load %s, Kerberos support will be disabled\n", SONAME_LIBKRB5); return; } #define LOAD_FUNCPTR(f) \ - if (!(p_##f = wine_dlsym(libkrb5_handle, #f, NULL, 0))) \ + if (!(p_##f = dlsym(libkrb5_handle, #f))) \ { \ ERR("Failed to load %s\n", #f); \ goto fail; \ @@ -161,7 +160,7 @@ static void load_krb5(void) return; fail: - wine_dlclose(libkrb5_handle, NULL, 0); + dlclose(libkrb5_handle); libkrb5_handle = NULL; } @@ -623,14 +622,14 @@ MAKE_FUNCPTR(gss_wrap_iov); static BOOL load_gssapi_krb5(void) { - if (!(libgssapi_krb5_handle = wine_dlopen( SONAME_LIBGSSAPI_KRB5, RTLD_NOW, NULL, 0 ))) + if (!(libgssapi_krb5_handle = dlopen( SONAME_LIBGSSAPI_KRB5, RTLD_NOW ))) { ERR_(winediag)( "Failed to load libgssapi_krb5, Kerberos SSP support will not be available.\n" ); return FALSE; } #define LOAD_FUNCPTR(f) \ - if (!(p##f = wine_dlsym( libgssapi_krb5_handle, #f, NULL, 0 ))) \ + if (!(p##f = dlsym( libgssapi_krb5_handle, #f ))) \ { \ ERR( "Failed to load %s\n", #f ); \ goto fail; \ @@ -658,14 +657,14 @@ static BOOL load_gssapi_krb5(void) return TRUE; fail: - wine_dlclose( libgssapi_krb5_handle, NULL, 0 ); + dlclose( libgssapi_krb5_handle ); libgssapi_krb5_handle = NULL; return FALSE; } static void unload_gssapi_krb5(void) { - wine_dlclose( libgssapi_krb5_handle, NULL, 0 ); + dlclose( libgssapi_krb5_handle ); libgssapi_krb5_handle = NULL; }

1 0

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

06 Apr '20

Module: wine Branch: master Commit: d9b6f26b7b6b4ed2a61967725575ce0aaa932843 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9b6f26b7b6b4ed2a6196772… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:47:33 2020 +0200 kernel32: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/term.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index b8877d4035..581b6467da 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -41,7 +41,6 @@ #include <winnls.h> #include <wincon.h> #include "console_private.h" -#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(console); @@ -175,17 +174,17 @@ static BOOL TERM_bind_libcurses(void) static const char ncname[] = SONAME_LIBCURSES; #endif - if (!(nc_handle = wine_dlopen(ncname, RTLD_NOW, NULL, 0))) + if (!(nc_handle = dlopen(ncname, RTLD_NOW))) { MESSAGE("Wine cannot find the " CURSES_NAME " library (%s).\n", ncname); return FALSE; } -#define LOAD_FUNCPTR(f) \ - if((p_##f = wine_dlsym(nc_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(nc_handle, #f)) == NULL) \ + { \ + WARN("Can't find symbol %s\n", #f); \ + goto sym_not_found; \ } LOAD_FUNCPTR(putp) @@ -202,7 +201,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 : mountmgr.sys: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 06 Apr '20

06 Apr '20

Module: wine Branch: master Commit: cf19a7ac4f6c01d2ac9516b5691a420b73fd1673 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf19a7ac4f6c01d2ac9516b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 11:47:56 2020 +0200 mountmgr.sys: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/dbus.c | 17 +++++++---------- dlls/mountmgr.sys/mountmgr.c | 1 - 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index c6d5d0b7af..27b35acd9c 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -44,7 +44,6 @@ #include "ip2string.h" #include "dhcpcsdk.h" -#include "wine/library.h" #include "wine/exception.h" #include "wine/debug.h" @@ -116,20 +115,19 @@ HAL_FUNCS; static BOOL load_hal_functions(void) { void *hal_handle; - char error[128]; /* Load libhal with RTLD_GLOBAL so that the dbus symbols are available. * We can't load libdbus directly since libhal may have been built against a * different version but with the same soname. Binary compatibility is for wimps. */ - if (!(hal_handle = wine_dlopen(SONAME_LIBHAL, RTLD_NOW|RTLD_GLOBAL, error, sizeof(error)))) + if (!(hal_handle = dlopen( SONAME_LIBHAL, RTLD_NOW | RTLD_GLOBAL ))) goto failed; -#define DO_FUNC(f) if (!(p_##f = wine_dlsym( RTLD_DEFAULT, #f, error, sizeof(error) ))) goto failed +#define DO_FUNC(f) if (!(p_##f = dlsym( RTLD_DEFAULT, #f ))) goto failed DBUS_FUNCS; #undef DO_FUNC -#define DO_FUNC(f) if (!(p_##f = wine_dlsym( hal_handle, #f, error, sizeof(error) ))) goto failed +#define DO_FUNC(f) if (!(p_##f = dlsym( hal_handle, #f ))) goto failed HAL_FUNCS; #undef DO_FUNC @@ -137,7 +135,7 @@ static BOOL load_hal_functions(void) return TRUE; failed: - WARN( "failed to load HAL support: %s\n", error ); + WARN( "failed to load HAL support: %s\n", dlerror() ); return FALSE; } @@ -185,18 +183,17 @@ static GUID *parse_uuid( GUID *guid, const char *str ) static BOOL load_dbus_functions(void) { void *handle; - char error[128]; - if (!(handle = wine_dlopen(SONAME_LIBDBUS_1, RTLD_NOW, error, sizeof(error)))) + if (!(handle = dlopen( SONAME_LIBDBUS_1, RTLD_NOW ))) goto failed; -#define DO_FUNC(f) if (!(p_##f = wine_dlsym( handle, #f, error, sizeof(error) ))) goto failed +#define DO_FUNC(f) if (!(p_##f = dlsym( handle, #f ))) goto failed DBUS_FUNCS; #undef DO_FUNC return TRUE; failed: - WARN( "failed to load DBUS support: %s\n", error ); + WARN( "failed to load DBUS support: %s\n", dlerror() ); return FALSE; } diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 3d84af47a6..21712dc9ce 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -34,7 +34,6 @@ #include "mountmgr.h" #include "winreg.h" -#include "wine/library.h" #include "wine/list.h" #include "wine/unicode.h" #include "wine/debug.h"

1 0