wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

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

07 Apr '20

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 : sane.ds: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 07 Apr '20

07 Apr '20

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 : qcap: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 07 Apr '20

07 Apr '20

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 : odbc32: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 07 Apr '20

07 Apr '20

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 : ntdll: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 07 Apr '20

07 Apr '20

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 : netapi32: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard 07 Apr '20

07 Apr '20

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

Brendan Shanks : winevulkan: Enable VK_KHR_get_surface_capabilities2.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 086c686e817a596e35c41dd5b37f3c28587af9d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=086c686e817a596e35c41dd5… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Apr 6 16:58:40 2020 -0700 winevulkan: Enable VK_KHR_get_surface_capabilities2. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/vulkan.c | 32 ++++++++++++++++++++++ dlls/winevulkan/make_vulkan | 7 +++-- dlls/winevulkan/vulkan_thunks.c | 46 +++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 20 ++++++++++++++ dlls/winex11.drv/vulkan.c | 60 +++++++++++++++++++++++++++++++++++++++++ include/wine/vulkan.h | 38 +++++++++++++++++++++++--- include/wine/vulkan_driver.h | 8 +++++- 7 files changed, 204 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=086c686e817a596e35c4…

1 0

Chip Davis : winemac.drv: Build with GL_SILENCE_DEPRECATION.
by Alexandre Julliard 07 Apr '20

07 Apr '20

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

Chip Davis : opencl: Build with CL_SILENCE_DEPRECATION.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 913413890443fac3b6863e7292829b4d9daa6bc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=913413890443fac3b6863e72… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Apr 6 17:04:24 2020 -0500 opencl: Build with CL_SILENCE_DEPRECATION. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/opencl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index 7e680ba057..06b8d78a40 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -30,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(opencl); +#define CL_SILENCE_DEPRECATION #if defined(HAVE_CL_CL_H) #define CL_USE_DEPRECATED_OPENCL_1_1_APIS #define CL_USE_DEPRECATED_OPENCL_1_2_APIS

1 0

Alexandre Julliard : krnl386: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 373973c9e955e7bec1b76978c32e2cc9f4884e94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=373973c9e955e7bec1b76978… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 14:25:22 2020 +0200 krnl386: Use stricmp() instead of _strnicmp(..., -1). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/ne_module.c | 4 ++-- dlls/krnl386.exe16/relay.c | 4 ++-- dlls/krnl386.exe16/resource.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 822a5df4c3..88485372ff 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -1462,7 +1462,7 @@ HMODULE16 WINAPI GetModuleHandle16( LPCSTR name ) loadedfn--; } /* case insensitive compare ... */ - if (!_strnicmp(loadedfn, s, -1)) + if (!stricmp(loadedfn, s)) return hModule; } return 0; @@ -1782,7 +1782,7 @@ static HMODULE16 NE_GetModuleByFilename( LPCSTR name ) loadedfn--; } /* case insensitive compare ... */ - if (!_strnicmp(loadedfn, s, -1)) + if (!stricmp(loadedfn, s)) return hModule; } /* If basename (without ext) matches the module name of a module: diff --git a/dlls/krnl386.exe16/relay.c b/dlls/krnl386.exe16/relay.c index 3543898d79..6eab9970a9 100644 --- a/dlls/krnl386.exe16/relay.c +++ b/dlls/krnl386.exe16/relay.c @@ -179,11 +179,11 @@ static BOOL check_list( const char *module, int ordinal, const char *func, const if (_strnicmp( module, *list, len-1 ) || module[len]) continue; if (p[1] == '*' && !p[2]) return TRUE; if (!strcmp( ord_str, p + 1 )) return TRUE; - if (func && !_strnicmp( func, p + 1, -1 )) return TRUE; + if (func && !stricmp( func, p + 1 )) return TRUE; } else /* function only */ { - if (func && !_strnicmp( func, *list, -1 )) return TRUE; + if (func && !stricmp( func, *list )) return TRUE; } } return FALSE; diff --git a/dlls/krnl386.exe16/resource.c b/dlls/krnl386.exe16/resource.c index 0be9e2906e..c303e25a2d 100644 --- a/dlls/krnl386.exe16/resource.c +++ b/dlls/krnl386.exe16/resource.c @@ -209,7 +209,7 @@ static DWORD NE_FindNameTableId( NE_MODULE *pModule, LPCSTR typeId, LPCSTR resId if (p[1] & 0x8000) { if (!HIWORD(typeId)) continue; - if (_strnicmp( typeId, (char *)(p + 3), -1 )) continue; + if (stricmp( typeId, (char *)(p + 3) )) continue; } else if (HIWORD(typeId) || (((DWORD)typeId & ~0x8000)!= p[1])) continue; @@ -219,7 +219,7 @@ static DWORD NE_FindNameTableId( NE_MODULE *pModule, LPCSTR typeId, LPCSTR resId if (p[2] & 0x8000) { if (!HIWORD(resId)) continue; - if (_strnicmp( resId, (char*)(p+3)+strlen((char*)(p+3))+1, -1 )) continue; + if (stricmp( resId, (char*)(p+3)+strlen((char*)(p+3))+1 )) continue; } else if (HIWORD(resId) || ((LOWORD(resId) & ~0x8000) != p[2]))

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