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

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

April 7, 2020

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

April 7, 2020

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

Zhiyi Zhang : d3d9/tests: Test cursor clipping.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: d378a1de53ae7e153dbffc4c5add99a1538fed74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d378a1de53ae7e153dbffc4c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 6 19:54:11 2020 +0800 d3d9/tests: Test cursor clipping. 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/d3d9/tests/device.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index efcd630e2d..b84a35714c 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -119,6 +119,14 @@ static BOOL compare_elements(IDirect3DVertexDeclaration9 *declaration, const D3D return equal; } +static void get_virtual_rect(RECT *rect) +{ + rect->left = GetSystemMetrics(SM_XVIRTUALSCREEN); + rect->top = GetSystemMetrics(SM_YVIRTUALSCREEN); + rect->right = rect->left + GetSystemMetrics(SM_CXVIRTUALSCREEN); + rect->bottom = rect->top + GetSystemMetrics(SM_CYVIRTUALSCREEN); +} + static HWND create_window(void) { RECT r = {0, 0, 640, 480}; @@ -13829,6 +13837,80 @@ static void test_creation_parameters(void) DestroyWindow(window); } +static void test_cursor_clipping(void) +{ + unsigned int adapter_idx, adapter_count, mode_idx; + D3DDISPLAYMODE mode, current_mode; + struct device_desc device_desc; + RECT virtual_rect, clip_rect; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + HWND window; + HRESULT hr; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + device_desc.device_window = window; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + + adapter_count = IDirect3D9_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + hr = IDirect3D9_GetAdapterDisplayMode(d3d, adapter_idx, &current_mode); + ok(hr == D3D_OK, "Adapter %u: GetAdapterDisplayMode failed, hr %#x.\n", adapter_idx, hr); + for (mode_idx = 0; SUCCEEDED(IDirect3D9_EnumAdapterModes(d3d, adapter_idx, D3DFMT_X8R8G8B8, + mode_idx, &mode)); ++mode_idx) + { + if (mode.Width < 640 || mode.Height < 480) + continue; + if (mode.Width != current_mode.Width && mode.Height != current_mode.Height) + break; + } + ok(mode.Width != current_mode.Width && mode.Height != current_mode.Height, + "Adapter %u: Failed to find a different mode than %ux%u.\n", adapter_idx, + current_mode.Width, current_mode.Height); + + ok(ClipCursor(NULL), "Adapter %u: ClipCursor failed, error %#x.\n", adapter_idx, + GetLastError()); + get_virtual_rect(&virtual_rect); + ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + GetLastError()); + ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", + adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); + + device_desc.adapter_ordinal = adapter_idx; + device_desc.width = mode.Width; + device_desc.height = mode.Height; + if (!(device = create_device(d3d, window, &device_desc))) + { + skip("Adapter %u: Failed to create a D3D device.\n", adapter_idx); + break; + } + flush_events(); + get_virtual_rect(&virtual_rect); + ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + GetLastError()); + todo_wine_if(!EqualRect(&clip_rect, &virtual_rect)) + ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", + adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); + + IDirect3DDevice9_Release(device); + flush_events(); + get_virtual_rect(&virtual_rect); + ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + GetLastError()); + todo_wine_if(!EqualRect(&clip_rect, &virtual_rect)) + ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", + adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); + } + + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = GetModuleHandleA("d3d9.dll"); @@ -13962,6 +14044,7 @@ START_TEST(device) test_multi_adapter(); test_shader_validator(); test_creation_parameters(); + test_cursor_clipping(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

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

April 7, 2020

Module: wine Branch: master Commit: 28e2e287d286de718b6be335c4209f67d742278b URL: https://source.winehq.org/git/wine.git/?a=commit;h=28e2e287d286de718b6be335… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:38:38 2020 +0200 odbc32: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbc32/proxyodbc.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 041d4dbf01..b28fb8928b 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -38,7 +38,6 @@ #include "winbase.h" #include "winreg.h" #include "wine/debug.h" -#include "wine/library.h" #include "wine/unicode.h" #include "sql.h" @@ -493,7 +492,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) case DLL_PROCESS_DETACH: if (reserved) break; - if (dmHandle) wine_dlclose(dmHandle,NULL,0); + if (dmHandle) dlclose(dmHandle); } return TRUE; @@ -512,14 +511,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) static BOOL ODBC_LoadDriverManager(void) { const char *s = getenv("LIB_ODBC_DRIVER_MANAGER"); - char error[256]; #ifdef SONAME_LIBODBC if (!s || !s[0]) s = SONAME_LIBODBC; #endif if (!s || !s[0]) goto failed; - dmHandle = wine_dlopen(s, RTLD_LAZY | RTLD_GLOBAL, error, sizeof(error)); + dmHandle = dlopen( s, RTLD_LAZY | RTLD_GLOBAL ); if (dmHandle != NULL) { @@ -528,7 +526,7 @@ static BOOL ODBC_LoadDriverManager(void) return TRUE; } failed: - ERR_(winediag)("failed to open library %s: %s\n", debugstr_a(s), error); + ERR_(winediag)("failed to open library %s: %s\n", debugstr_a(s), dlerror()); nErrorType = ERROR_LIBRARY_NOT_FOUND; return FALSE; } @@ -546,14 +544,12 @@ failed: static BOOL ODBC_LoadDMFunctions(void) { - char error[256]; - if (dmHandle == NULL) return FALSE; #define LOAD_FUNC(name) \ - if ((p##name = wine_dlsym( dmHandle, #name, error, sizeof(error) ))); \ - else WARN( "Failed to load %s: %s\n", #name, error ) + if ((p##name = dlsym( dmHandle, #name ))); \ + else WARN( "Failed to load %s: %s\n", #name, dlerror() ) LOAD_FUNC(SQLAllocConnect); LOAD_FUNC(SQLAllocEnv);

1 0

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

April 7, 2020

Module: wine Branch: master Commit: 1938ddc65181642d68022784c3e3732c536db4c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1938ddc65181642d68022784… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:37:50 2020 +0200 netapi32: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/netapi32.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index f86e033c21..4cbd02f9d3 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -57,7 +57,6 @@ #include "dsgetdc.h" #include "davclnt.h" #include "wine/debug.h" -#include "wine/library.h" #include "wine/list.h" #include "wine/unicode.h" #include "initguid.h" @@ -134,19 +133,17 @@ static BOOL init_context(void) static BOOL libnetapi_init(void) { - char buf[200]; - if (libnetapi_handle) return TRUE; - if (!(libnetapi_handle = wine_dlopen( SONAME_LIBNETAPI, RTLD_NOW, buf, sizeof(buf) ))) + if (!(libnetapi_handle = dlopen( SONAME_LIBNETAPI, RTLD_NOW ))) { - WARN( "Failed to load libnetapi: %s\n", buf ); + WARN( "Failed to load libnetapi: %s\n", dlerror() ); return FALSE; } #define LOAD_FUNCPTR(f) \ - if (!(p##f = wine_dlsym( libnetapi_handle, #f, buf, sizeof(buf) ))) \ + if (!(p##f = dlsym( libnetapi_handle, #f ))) \ { \ - ERR( "Failed to load %s: %s\n", #f, buf ); \ + ERR( "Failed to load %s: %s\n", #f, dlerror() ); \ goto error; \ } @@ -167,7 +164,7 @@ static BOOL libnetapi_init(void) if (init_context()) return TRUE; error: - wine_dlclose( libnetapi_handle, NULL, 0 ); + dlclose( libnetapi_handle ); libnetapi_handle = NULL; return FALSE; }

1 0

Alexandre Julliard : dbghelp: Make qsort callback explicitly cdecl.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 0163db5152124efbd1a5ba46aa52a6da66d897d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0163db5152124efbd1a5ba46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 09:14:17 2020 +0200 dbghelp: Make qsort callback explicitly cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/symbol.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 08986881a9..67cb04c0d9 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -720,7 +720,7 @@ extern DWORD64 sw_module_base(struct cpu_stack_walk* csw, DWORD64 addr) DEC extern const char* symt_get_name(const struct symt* sym) DECLSPEC_HIDDEN; extern WCHAR* symt_get_nameW(const struct symt* sym) DECLSPEC_HIDDEN; extern BOOL symt_get_address(const struct symt* type, ULONG64* addr) DECLSPEC_HIDDEN; -extern int symt_cmp_addr(const void* p1, const void* p2) DECLSPEC_HIDDEN; +extern int __cdecl symt_cmp_addr(const void* p1, const void* p2) DECLSPEC_HIDDEN; extern void copy_symbolW(SYMBOL_INFOW* siw, const SYMBOL_INFO* si) DECLSPEC_HIDDEN; extern struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index bcb26ee704..706d088aec 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -51,7 +51,7 @@ static inline int cmp_sorttab_addr(struct module* module, int idx, ULONG64 addr) return cmp_addr(ref, addr); } -int symt_cmp_addr(const void* p1, const void* p2) +int __cdecl symt_cmp_addr(const void* p1, const void* p2) { const struct symt* sym1 = *(const struct symt* const *)p1; const struct symt* sym2 = *(const struct symt* const *)p2;

1 0

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

April 7, 2020

Module: wine Branch: master Commit: f64e34b01456de26e5a8f60e8494cbe839964071 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f64e34b01456de26e5a8f60e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:38:00 2020 +0200 ntdll: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 23fde1f516..79165c2dac 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2596,7 +2596,6 @@ done: static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, const char *so_name, WINE_MODREF** pwm ) { - char error[256]; void *handle; struct builtin_load_info info, *prev_info; ANSI_STRING unix_name; @@ -2620,7 +2619,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, prev_info = builtin_load_info; builtin_load_info = &info; - handle = wine_dlopen( so_name ? so_name : unix_name.Buffer, RTLD_NOW, error, sizeof(error) ); + handle = dlopen( so_name ? so_name : unix_name.Buffer, RTLD_NOW ); builtin_load_info = prev_info; RtlFreeHeap( GetProcessHeap(), 0, unix_name.Buffer ); @@ -2628,10 +2627,10 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, { if (so_name) { - ERR("failed to load .so lib %s: %s\n", debugstr_a(so_name), error ); + ERR("failed to load .so lib %s: %s\n", debugstr_a(so_name), dlerror() ); return STATUS_PROCEDURE_NOT_FOUND; } - WARN( "failed to load .so lib %s: %s\n", debugstr_us(nt_name), error ); + WARN( "failed to load .so lib %s: %s\n", debugstr_us(nt_name), dlerror() ); return STATUS_INVALID_IMAGE_FORMAT; } @@ -2651,7 +2650,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, debugstr_w(info.wm->ldr.FullDllName.Buffer), info.wm->ldr.BaseAddress, debugstr_us(nt_name) ); if (info.wm->ldr.LoadCount != -1) info.wm->ldr.LoadCount++; - wine_dlclose( handle, NULL, 0 ); /* release the libdl refcount */ + dlclose( handle ); /* release the libdl refcount */ } else { @@ -2664,7 +2663,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, return STATUS_SUCCESS; failed: - wine_dlclose( handle, NULL, 0 ); + dlclose( handle ); return info.status; } @@ -3588,8 +3587,7 @@ static void free_modref( WINE_MODREF *wm ) free_tls_slot( &wm->ldr ); RtlReleaseActivationContext( wm->ldr.ActivationContext ); - if ((wm->ldr.Flags & LDR_WINE_INTERNAL) && wm->ldr.SectionHandle) - wine_dlclose( wm->ldr.SectionHandle, NULL, 0 ); + if ((wm->ldr.Flags & LDR_WINE_INTERNAL) && wm->ldr.SectionHandle) dlclose( wm->ldr.SectionHandle ); NtUnmapViewOfSection( NtCurrentProcess(), wm->ldr.BaseAddress ); if (cached_modref == wm) cached_modref = NULL; RtlFreeUnicodeString( &wm->ldr.FullDllName );

1 0

Alexandre Julliard : dbghelp: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 341feeb10eddd3d139c4c206a43db80d0671ff3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=341feeb10eddd3d139c4c206… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 14:25:07 2020 +0200 dbghelp: Use stricmp() instead of _strnicmp(..., -1). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 2 +- dlls/dbghelp/pe_module.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 0f0aa25e76..4dcbd41f26 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2682,7 +2682,7 @@ static void pdb_process_symbol_imports(const struct process* pcs, { ptr = (const char*)imp + sizeof(*imp) + strlen(imp->filename); if (i >= CV_MAX_MODULES) FIXME("Out of bounds!!!\n"); - if (!_strnicmp(pdb_lookup->filename, imp->filename, -1)) + if (!stricmp(pdb_lookup->filename, imp->filename)) { if (module_index != -1) FIXME("Twice the entry\n"); else module_index = i; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index a5219532b9..d6f297a213 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -127,7 +127,7 @@ static BOOL pe_find_section(struct image_file_map* fmap, const char* name, sectname = memcpy(tmp, sectname, IMAGE_SIZEOF_SHORT_NAME); tmp[IMAGE_SIZEOF_SHORT_NAME] = '\0'; } - if (!_strnicmp(sectname, name, -1)) + if (!stricmp(sectname, name)) { ism->fmap = fmap; ism->sidx = i;

1 0

Chip Davis : winemac.drv: Build with GL_SILENCE_DEPRECATION.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: c66b51b36a19939680f8cb6799160748df44a3fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c66b51b36a19939680f8cb67… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Apr 6 17:04:25 2020 -0500 winemac.drv: Build with GL_SILENCE_DEPRECATION. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/opengl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 5197e15fbb..c60a22719a 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -32,6 +32,7 @@ #include "wine/wgl.h" #include "wine/wgl_driver.h" +#define GL_SILENCE_DEPRECATION #define __gl_h_ #define __gltypes_h_ #include <OpenGL/OpenGL.h>

1 0

Jacek Caban : configure: Get rid of no longer needed zlib checks.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 4f84cc454ae6f324f46477343a25a2cfb14d2c33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f84cc454ae6f324f4647734… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 6 23:42:29 2020 +0200 configure: Get rid of no longer needed zlib checks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 107 ---------------------------------------------------- configure.ac | 13 ------- include/config.h.in | 6 --- 3 files changed, 126 deletions(-) diff --git a/configure b/configure index 6db2725807..75327beacf 100755 --- a/configure +++ b/configure @@ -673,8 +673,6 @@ GSTREAMER_CFLAGS PULSE_LIBS PULSE_CFLAGS GETTEXTPO_LIBS -Z_LIBS -Z_CFLAGS FREETYPE_LIBS FREETYPE_CFLAGS LCMS2_LIBS @@ -898,7 +896,6 @@ with_xshape with_xshm with_xslt with_xxf86vm -with_zlib with_wine_tools with_wine64 enable_largefile @@ -1866,8 +1863,6 @@ LCMS2_CFLAGS LCMS2_LIBS FREETYPE_CFLAGS FREETYPE_LIBS -Z_CFLAGS -Z_LIBS PULSE_CFLAGS PULSE_LIBS GSTREAMER_CFLAGS @@ -2602,7 +2597,6 @@ Optional Packages: --without-xshm do not use XShm (shared memory extension) --without-xslt do not use XSLT --without-xxf86vm do not use XFree video mode extension - --without-zlib do not use Zlib (data compression) --with-wine-tools=DIR use Wine tools from directory DIR --with-wine64=DIR use the 64-bit Wine in DIR for a Wow64 build --with-x use the X Window System @@ -2654,8 +2648,6 @@ Some influential environment variables: C compiler flags for freetype2, overriding pkg-config FREETYPE_LIBS Linker flags for freetype2, overriding pkg-config - Z_CFLAGS C compiler flags for libz, overriding pkg-config - Z_LIBS Linker flags for libz, overriding pkg-config PULSE_CFLAGS C compiler flags for libpulse, overriding pkg-config PULSE_LIBS Linker flags for libpulse, overriding pkg-config @@ -4212,12 +4204,6 @@ if test "${with_xxf86vm+set}" = set; then : fi -# Check whether --with-zlib was given. -if test "${with_zlib+set}" = set; then : - withval=$with_zlib; -fi - - # Check whether --with-wine-tools was given. if test "${with_wine_tools+set}" = set; then : @@ -14477,97 +14463,6 @@ done LIBS="$ac_wine_check_funcs_save_LIBS" -if test "x$with_zlib" != "xno" -then - if ${Z_CFLAGS:+false} :; then : - if ${PKG_CONFIG+:} false; then : - Z_CFLAGS=`$PKG_CONFIG --cflags libz 2>/dev/null` -fi -fi - -if ${Z_LIBS:+false} :; then : - if ${PKG_CONFIG+:} false; then : - Z_LIBS=`$PKG_CONFIG --libs libz 2>/dev/null` -fi -fi - -Z_LIBS=${Z_LIBS:-"-lz"} -$as_echo "$as_me:${as_lineno-$LINENO}: libz cflags: $Z_CFLAGS" >&5 -$as_echo "$as_me:${as_lineno-$LINENO}: libz libs: $Z_LIBS" >&5 -ac_save_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS $Z_CFLAGS" -for ac_header in zlib.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" -if test "x$ac_cv_header_zlib_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_ZLIB_H 1 -_ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5 -$as_echo_n "checking for inflate in -lz... " >&6; } -if ${ac_cv_lib_z_inflate+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lz $Z_LIBS $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char inflate (); -int -main () -{ -return inflate (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_z_inflate=yes -else - ac_cv_lib_z_inflate=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5 -$as_echo "$ac_cv_lib_z_inflate" >&6; } -if test "x$ac_cv_lib_z_inflate" = xyes; then : - -$as_echo "#define HAVE_ZLIB 1" >>confdefs.h - -else - Z_LIBS="" -fi - -else - Z_LIBS="" -fi - -done - -CPPFLAGS=$ac_save_CPPFLAGS -test -z "$Z_CFLAGS" || Z_CFLAGS=`echo " $Z_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` -test -z "$Z_LIBS" || Z_LIBS=`echo " $Z_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` - -fi -if test "x$Z_LIBS" = "x"; then : - case "x$with_zlib" in - x) as_fn_append wine_notices "|libz ${notice_platform}development files not found, data compression won't be supported." ;; - xno) ;; - *) as_fn_error $? "libz ${notice_platform}development files not found, data compression won't be supported. -This is an error since --with-zlib was requested." "$LINENO" 5 ;; -esac - -fi - if test "x$enable_tools" != xno -a "x$with_gettextpo" = xyes then if test "$ac_cv_header_gettext_po_h" = "yes" @@ -20011,8 +19906,6 @@ LCMS2_CFLAGS = $LCMS2_CFLAGS LCMS2_LIBS = $LCMS2_LIBS FREETYPE_CFLAGS = $FREETYPE_CFLAGS FREETYPE_LIBS = $FREETYPE_LIBS -Z_CFLAGS = $Z_CFLAGS -Z_LIBS = $Z_LIBS GETTEXTPO_LIBS = $GETTEXTPO_LIBS PULSE_CFLAGS = $PULSE_CFLAGS PULSE_LIBS = $PULSE_LIBS diff --git a/configure.ac b/configure.ac index 9e29234b42..e65f2d33ca 100644 --- a/configure.ac +++ b/configure.ac @@ -111,7 +111,6 @@ AC_ARG_WITH(xshm, AS_HELP_STRING([--without-xshm],[do not use XShm (shared AC_ARG_WITH(xslt, AS_HELP_STRING([--without-xslt],[do not use XSLT])) AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi]) -AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib],[do not use Zlib (data compression)])) AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR])) AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build])) @@ -1596,18 +1595,6 @@ WINE_CHECK_LIB_FUNCS(\ pthread_getthreadid_np, [$PTHREAD_LIBS]) -dnl **** Check for zlib **** -if test "x$with_zlib" != "xno" -then - WINE_PACKAGE_FLAGS(Z,[libz],[-lz],,, - [AC_CHECK_HEADERS(zlib.h, - [AC_CHECK_LIB(z,inflate, - [AC_DEFINE(HAVE_ZLIB,1,[Define to 1 if you have the `z' library (-lz).])], - [Z_LIBS=""],[$Z_LIBS])], - [Z_LIBS=""])]) -fi -WINE_NOTICE_WITH(zlib,[test "x$Z_LIBS" = "x"],[libz ${notice_platform}development files not found, data compression won't be supported.]) - dnl **** Check for gettextpo **** if test "x$enable_tools" != xno -a "x$with_gettextpo" = xyes then diff --git a/include/config.h.in b/include/config.h.in index 8ccbf0e7e5..8cbf8db09a 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1291,12 +1291,6 @@ /* Define to 1 if you have the `yn' function. */ #undef HAVE_YN -/* Define to 1 if you have the `z' library (-lz). */ -#undef HAVE_ZLIB - -/* Define to 1 if you have the <zlib.h> header file. */ -#undef HAVE_ZLIB_H - /* Define to 1 if you have the `_spawnvp' function. */ #undef HAVE__SPAWNVP

1 0