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

Zhiyi Zhang : d3d9/tests: Test cursor clipping.
by Alexandre Julliard 07 Apr '20

07 Apr '20

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

Chip Davis : d3d11: Introduce a function to convert a D3D feature level to a D3D10.1 feature level.
by Alexandre Julliard 07 Apr '20

07 Apr '20

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

Chip Davis : d2d1: Return enum constants directly in d2d_bitmap_brush_GetInterpolationMode() (Clang).
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 69487dad1c60935502078fa6b38346b2e2e1689c URL: https://source.winehq.org/git/wine.git/?a=commit;h=69487dad1c60935502078fa6… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Apr 6 17:51:58 2020 -0500 d2d1: Return enum constants directly in d2d_bitmap_brush_GetInterpolationMode() (Clang). 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/d2d1/brush.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index cc557ea9ef..675fa52e72 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1010,8 +1010,8 @@ static D2D1_BITMAP_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetInte switch (brush->u.bitmap.interpolation_mode) { case D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR: + return D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR; case D2D1_INTERPOLATION_MODE_LINEAR: - return brush->u.bitmap.interpolation_mode; default: return D2D1_BITMAP_INTERPOLATION_MODE_LINEAR; }

1 0

Jacek Caban : dbghelp: Get rid of no longer needed HAVE_ZLIB checks.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: 6b1bc0beac510aa48a848b8182b9310f92609dd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b1bc0beac510aa48a848b81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 6 23:42:01 2020 +0200 dbghelp: Get rid of no longer needed HAVE_ZLIB checks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 5925a00bfe..53274c4f59 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3363,7 +3363,6 @@ static void dwarf2_location_compute(struct process* pcs, } } -#ifdef HAVE_ZLIB static void *zalloc(void *priv, uInt items, uInt sz) { return HeapAlloc(GetProcessHeap(), 0, items * sz); @@ -3445,8 +3444,6 @@ out: return ret; } -#endif - static inline BOOL dwarf2_init_section(dwarf2_section_t* section, struct image_file_map* fmap, const char* sectname, const char* zsectname, struct image_section_map* ism) @@ -3470,11 +3467,7 @@ static inline BOOL dwarf2_init_section(dwarf2_section_t* section, struct image_f if (zsectname && image_find_section(fmap, zsectname, ism)) { -#ifdef HAVE_ZLIB return dwarf2_init_zsection(section, zsectname, ism); -#else - FIXME("dbghelp not built with zlib, but compressed section found\n" ); -#endif } return FALSE;

1 0

Jacek Caban : dbghelp: Get rid of no longer needed #ifdefs.
by Alexandre Julliard 07 Apr '20

07 Apr '20

Module: wine Branch: master Commit: e014d325ddb87dbb4678ef47ef17f9e7f49b0248 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e014d325ddb87dbb4678ef47… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 6 23:42:15 2020 +0200 dbghelp: Get rid of no longer needed #ifdefs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/stabs.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index e14e154cba..b1b4a6ef1c 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -51,33 +51,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); /* Masks for n_type field */ -#ifndef N_STAB #define N_STAB 0xe0 -#endif -#ifndef N_PEXT #define N_PEXT 0x10 -#endif -#ifndef N_TYPE #define N_TYPE 0x1e -#endif -#ifndef N_EXT #define N_EXT 0x01 -#endif /* Values for (n_type & N_TYPE) */ -#ifndef N_UNDF #define N_UNDF 0x00 -#endif -#ifndef N_ABS #define N_ABS 0x02 -#endif -#ifndef N_INDR #define N_INDR 0x0a -#endif -#ifndef N_SECT #define N_SECT 0x0e -#endif - #define N_GSYM 0x20 #define N_FUN 0x24 #define N_STSYM 0x26

1 0

Jacek Caban : configure: Get rid of no longer needed zlib checks.
by Alexandre Julliard 07 Apr '20

07 Apr '20

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

Alexandre Julliard : dbghelp: Make qsort callback explicitly cdecl.
by Alexandre Julliard 07 Apr '20

07 Apr '20

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 : dbghelp: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard 07 Apr '20

07 Apr '20

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

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

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