March 2022 - Wine-Commits - list.winehq.org

Jacek Caban : win32u: Move NtUserGetClassName implementation from user32.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: cc4fb58d047610596066197b203ad97f51302cb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc4fb58d047610596066197b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 4 14:28:31 2022 +0100 win32u: Move NtUserGetClassName implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 64 ++---------------------------------- dlls/win32u/class.c | 77 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 24 ++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/tests/win32u.c | 34 +++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 4 +-- include/ntuser.h | 1 + 8 files changed, 142 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cc4fb58d047610596066…

1 0

Jacek Caban : user32: Store class instance as UINT_PTR.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: 7acd2f1ced4cbb8d340b3497f620606d5dc31bd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7acd2f1ced4cbb8d340b3497… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 4 14:28:59 2022 +0100 user32: Store class instance as UINT_PTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 15 ++++++++------- dlls/win32u/ntuser_private.h | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 5255ed1ea25..b24e72be324 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -296,9 +296,10 @@ static void CLASS_FreeClass( CLASS *classPtr ) USER_Unlock(); } -static CLASS *find_class( HINSTANCE instance, const WCHAR *name ) +static CLASS *find_class( HINSTANCE module, const WCHAR *name ) { ATOM atom = get_int_atom_value( name ); + UINT_PTR instance = (UINT_PTR)module; CLASS *class; USER_Lock(); @@ -312,9 +313,9 @@ static CLASS *find_class( HINSTANCE instance, const WCHAR *name ) { if (wcsicmp( class->name, name )) continue; } - if (!class->local || class->hInstance == instance) + if (!class->local || class->instance == instance) { - TRACE("%s %p -> %p\n", debugstr_w(name), instance, class); + TRACE("%s %Ix -> %p\n", debugstr_w(name), instance, class); return class; } } @@ -477,7 +478,7 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, UINT basename_offset, HINSTANCE classPtr->local = local; classPtr->cbWndExtra = winExtra; classPtr->cbClsExtra = classExtra; - classPtr->hInstance = hInstance; + classPtr->instance = (UINT_PTR)hInstance; /* Other non-null values must be set by caller */ @@ -953,7 +954,7 @@ static ULONG_PTR CLASS_GetClassLong( HWND hwnd, INT offset, UINT size, retvalue = class->cbClsExtra; break; case GCLP_HMODULE: - retvalue = (ULONG_PTR)class->hInstance; + retvalue = class->instance; break; case GCLP_WNDPROC: retvalue = (ULONG_PTR)WINPROC_GetProc( class->winproc, unicode ); @@ -1120,8 +1121,8 @@ static ULONG_PTR CLASS_SetClassLong( HWND hwnd, INT offset, LONG_PTR newval, break; case GCLP_HMODULE: if (!set_server_info( hwnd, offset, newval, size )) break; - retval = (ULONG_PTR)class->hInstance; - class->hInstance = (HINSTANCE)newval; + retval = class->instance; + class->instance = newval; break; case GCW_ATOM: if (!set_server_info( hwnd, offset, newval, size )) break; diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index a7f05f9c5d2..8878718d416 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -179,7 +179,7 @@ typedef struct tagCLASS INT cbWndExtra; /* Window extra bytes */ LPWSTR menuName; /* Default menu name (Unicode followed by ASCII) */ struct dce *dce; /* Opaque pointer to class DCE */ - HINSTANCE hInstance; /* Module that created the task */ + UINT_PTR instance; /* Module that created the task */ HICON hIcon; /* Default icon */ HICON hIconSm; /* Default small icon */ HICON hIconSmIntern; /* Internal small icon, derived from hIcon */

1 0

Rémi Bernon : dinput: Use a custom GUID to open a device from a device path.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: 8b288980b2c8605fce1cba5426fd6c8404e898ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b288980b2c8605fce1cba54… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 4 10:05:09 2022 +0100 dinput: Use a custom GUID to open a device from a device path. So that we can access all the controller devices conveniently through DInput without having to reimplement the whole HID client, or having to enumerate the devices every time a new device needs to be open, and being able to workaround the limitations of the device the XInput controllers are usually exposing. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 4f1c8444e43..c97588d8a07 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -50,6 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); DEFINE_GUID( GUID_DEVINTERFACE_WINEXINPUT,0x6c53d5fd,0x6480,0x440f,0xb6,0x18,0x47,0x67,0x50,0xc5,0xe1,0xa6 ); DEFINE_GUID( hid_joystick_guid, 0x9e573edb, 0x7734, 0x11d2, 0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7 ); +DEFINE_GUID( device_path_guid, 0x00000000, 0x0000, 0x0000, 0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf8 ); DEFINE_DEVPROPKEY( DEVPROPKEY_HID_HANDLE, 0xbc62e415, 0xf4fe, 0x405c, 0x8e, 0xda, 0x63, 0x6f, 0xb5, 0x9f, 0x08, 0x98, 2 ); struct pid_control_report @@ -2041,7 +2042,12 @@ HRESULT hid_joystick_create_device( struct dinput *dinput, const GUID *guid, IDi else if (IsEqualGUID( &hid_joystick_guid, &instance.guidInstance )) instance.guidInstance = *guid; else - return DIERR_DEVICENOTREG; + { + instance.guidInstance.Data1 = device_path_guid.Data1; + instance.guidInstance.Data2 = device_path_guid.Data2; + instance.guidInstance.Data3 = device_path_guid.Data3; + if (!IsEqualGUID( &device_path_guid, &instance.guidInstance )) return DIERR_DEVICENOTREG; + } hr = dinput_device_alloc( sizeof(struct hid_joystick), &hid_joystick_vtbl, guid, dinput, (void **)&impl ); if (FAILED(hr)) return hr; @@ -2050,8 +2056,16 @@ HRESULT hid_joystick_create_device( struct dinput *dinput, const GUID *guid, IDi impl->base.read_event = CreateEventW( NULL, TRUE, FALSE, NULL ); impl->internal_ref = 1; - hr = hid_joystick_device_open( -1, &instance, impl->device_path, &impl->device, &impl->preparsed, - &attrs, &impl->caps, dinput->dwVersion ); + if (!IsEqualGUID( &device_path_guid, &instance.guidInstance )) + hr = hid_joystick_device_open( -1, &instance, impl->device_path, &impl->device, &impl->preparsed, + &attrs, &impl->caps, dinput->dwVersion ); + else + { + wcscpy( impl->device_path, *(const WCHAR **)guid ); + if (!hid_joystick_device_try_open( 0, impl->device_path, &impl->device, &impl->preparsed, &attrs, + &impl->caps, &instance, dinput->dwVersion )) + hr = DIERR_DEVICENOTREG; + } if (hr != DI_OK) goto failed; impl->base.instance = instance;

1 0

Eric Pouech : serialui/tests: Enable compilation with long types.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: 2add24bd7dfe1aea00c2852f3dfef5a406787275 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2add24bd7dfe1aea00c2852f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:25:59 2022 +0100 serialui/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/serialui/tests/Makefile.in | 1 - dlls/serialui/tests/confdlg.c | 64 ++++++++++++++++++++--------------------- 2 files changed, 32 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2add24bd7dfe1aea00c2…

1 0

Hans Leidekker : crypt32: Add support for encoding OCSP requests.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: 92821ebd49abfaf7435295c83c9e2bb3604c2f1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=92821ebd49abfaf7435295c8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 4 13:57:15 2022 +0100 crypt32: Add support for encoding OCSP requests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/encode.c | 192 ++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 85 ++++++++++++++++++++ 2 files changed, 277 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=92821ebd49abfaf74352…

1 0

Eric Pouech : secur32/tests: Enable compilation with long types.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: a92db992c98776ddeb4b3e25327ef2481d3180f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a92db992c98776ddeb4b3e25… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:25:53 2022 +0100 secur32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/Makefile.in | 1 - dlls/secur32/tests/main.c | 12 +- dlls/secur32/tests/negotiate.c | 46 +++---- dlls/secur32/tests/ntlm.c | 46 +++---- dlls/secur32/tests/schannel.c | 286 ++++++++++++++++++++--------------------- dlls/secur32/tests/secur32.c | 86 ++++++------- 6 files changed, 238 insertions(+), 239 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a92db992c98776ddeb4b…

1 0

Eric Pouech : kernel32/tests/module: Enable compilation with long types.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: 65f36a9695ae2050d7c3d7b01d066d5eb26e557b URL: https://source.winehq.org/git/wine.git/?a=commit;h=65f36a9695ae2050d7c3d7b0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:24:31 2022 +0100 kernel32/tests/module: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 285 ++++++++++++++++++++++--------------------- 1 file changed, 143 insertions(+), 142 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=65f36a9695ae2050d7c3…

1 0

Zebediah Figura : configure: Try to detect MinGW libvkd3d using pkg-config if --with-system-dllpath is specified.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: 2c5084e05fa5b28c6f869e74d295cf612dcd4540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c5084e05fa5b28c6f869e74… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 3 19:50:10 2022 -0600 configure: Try to detect MinGW libvkd3d using pkg-config if --with-system-dllpath is specified. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 205 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 21 ++++++ 2 files changed, 226 insertions(+) diff --git a/configure b/configure index 20bcb96a2a6..3df610cbf11 100755 --- a/configure +++ b/configure @@ -12812,6 +12812,211 @@ CPPFLAGS=$ac_save_CPPFLAGS as_fn_append wine_notices "|libxslt ${notice_platform}MinGW development files not found; using bundled version." fi + if ${VKD3D_PE_CFLAGS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + VKD3D_PE_CFLAGS=`$MINGW_PKG_CONFIG --cflags libvkd3d libvkd3d-shader 2>/dev/null` +fi +fi +if ${VKD3D_PE_LIBS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + VKD3D_PE_LIBS=`$MINGW_PKG_CONFIG --libs libvkd3d libvkd3d-shader 2>/dev/null` +fi +fi +VKD3D_PE_LIBS=${VKD3D_PE_LIBS:-"-lvkd3d -lvkd3d-shader"} +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $VKD3D_PE_CFLAGS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW vkd3d.h" >&5 +printf %s "checking for MinGW vkd3d.h... " >&6; } +if test ${ac_cv_mingw_header_vkd3d_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <vkd3d.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_vkd3d_h=yes +else $as_nop + ac_cv_mingw_header_vkd3d_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_vkd3d_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_vkd3d_h" >&6; } +if test "x$ac_cv_mingw_header_vkd3d_h" = xyes +then : + +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW vkd3d_shader.h" >&5 +printf %s "checking for MinGW vkd3d_shader.h... " >&6; } +if test ${ac_cv_mingw_header_vkd3d_shader_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <vkd3d_shader.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_vkd3d_shader_h=yes +else $as_nop + ac_cv_mingw_header_vkd3d_shader_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_vkd3d_shader_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_vkd3d_shader_h" >&6; } +if test "x$ac_cv_mingw_header_vkd3d_shader_h" = xyes +then : + +fi + if test "$ac_cv_mingw_header_vkd3d_h" = "yes" -a "$ac_cv_mingw_header_vkd3d_shader_h" = "yes" + then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vkd3d_serialize_versioned_root_signature in MinGW -lvkd3d" >&5 +printf %s "checking for vkd3d_serialize_versioned_root_signature in MinGW -lvkd3d... " >&6; } +if test ${ac_cv_mingw_lib_vkd3d+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-lvkd3d $VKD3D_PE_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. */ +char vkd3d_serialize_versioned_root_signature (); +int +main (void) +{ +return vkd3d_serialize_versioned_root_signature (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_vkd3d=yes +else $as_nop + ac_cv_mingw_lib_vkd3d=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_vkd3d" >&5 +printf "%s\n" "$ac_cv_mingw_lib_vkd3d" >&6; } +if test "x$ac_cv_mingw_lib_vkd3d" = xyes +then : + : +else $as_nop + : +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vkd3d_shader_compile in MinGW -lvkd3d-shader" >&5 +printf %s "checking for vkd3d_shader_compile in MinGW -lvkd3d-shader... " >&6; } +if test ${ac_cv_mingw_lib_vkd3d_shader+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-lvkd3d-shader $VKD3D_PE_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. */ +char vkd3d_shader_compile (); +int +main (void) +{ +return vkd3d_shader_compile (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_vkd3d_shader=yes +else $as_nop + ac_cv_mingw_lib_vkd3d_shader=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_vkd3d_shader" >&5 +printf "%s\n" "$ac_cv_mingw_lib_vkd3d_shader" >&6; } +if test "x$ac_cv_mingw_lib_vkd3d_shader" = xyes +then : + : +else $as_nop + : +fi + if test "$ac_cv_mingw_lib_vkd3d" = "no" -o "$ac_cv_mingw_lib_vkd3d_shader" = "no" + then + VKD3D_PE_CFLAGS="" + VKD3D_PE_LIBS="" + fi + else + VKD3D_PE_CFLAGS="" + VKD3D_PE_LIBS="" + fi +CPPFLAGS=$ac_save_CPPFLAGS + + if test "x$VKD3D_PE_LIBS" = "x" + then + as_fn_append wine_notices "|libvkd3d ${notice_platform}MinGW development files not found; using bundled version." + fi + if ${ZLIB_PE_CFLAGS:+false} : then : if test ${MINGW_PKG_CONFIG+y} diff --git a/configure.ac b/configure.ac index a1f7a7d5e2c..ab3490b21cd 100644 --- a/configure.ac +++ b/configure.ac @@ -1084,6 +1084,27 @@ then WINE_NOTICE([libxslt ${notice_platform}MinGW development files not found; using bundled version.]) fi + WINE_MINGW_PACKAGE_FLAGS(VKD3D,[libvkd3d libvkd3d-shader],[-lvkd3d -lvkd3d-shader], + [WINE_CHECK_MINGW_HEADER(vkd3d.h) + WINE_CHECK_MINGW_HEADER(vkd3d_shader.h) + if test "$ac_cv_mingw_header_vkd3d_h" = "yes" -a "$ac_cv_mingw_header_vkd3d_shader_h" = "yes" + then + WINE_CHECK_MINGW_LIB(vkd3d,vkd3d_serialize_versioned_root_signature,[:],[:],[$VKD3D_PE_LIBS]) + WINE_CHECK_MINGW_LIB(vkd3d-shader,vkd3d_shader_compile,[:],[:],[$VKD3D_PE_LIBS]) + if test "$ac_cv_mingw_lib_vkd3d" = "no" -o "$ac_cv_mingw_lib_vkd3d_shader" = "no" + then + VKD3D_PE_CFLAGS="" + VKD3D_PE_LIBS="" + fi + else + VKD3D_PE_CFLAGS="" + VKD3D_PE_LIBS="" + fi]) + if test "x$VKD3D_PE_LIBS" = "x" + then + WINE_NOTICE([libvkd3d ${notice_platform}MinGW development files not found; using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],

1 0

Eric Pouech : schedsvc/tests: Enable compilation with long types.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: bb14e7b79fcfb59385051cfb1c34a8d22d15fd9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb14e7b79fcfb59385051cfb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:25:40 2022 +0100 schedsvc/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/tests/Makefile.in | 1 - dlls/schedsvc/tests/atsvcapi.c | 44 ++++----- dlls/schedsvc/tests/rpcapi.c | 210 ++++++++++++++++++++-------------------- 3 files changed, 127 insertions(+), 128 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bb14e7b79fcfb5938505…

1 0

Eric Pouech : schannel/tests: Enable compilation with long types.
by Alexandre Julliard March 4, 2022

March 4, 2022

Module: wine Branch: master Commit: f953caf314614b3ee6f8547a879edeaa43a0ab39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f953caf314614b3ee6f8547a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:25:34 2022 +0100 schannel/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schannel/tests/Makefile.in | 1 - dlls/schannel/tests/main.c | 48 ++++++++++++++++++++--------------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/schannel/tests/Makefile.in b/dlls/schannel/tests/Makefile.in index ee755457e98..ca82dccfd9b 100644 --- a/dlls/schannel/tests/Makefile.in +++ b/dlls/schannel/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = schannel.dll C_SRCS = \ diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index 4b4b7b4f388..f876d934f3d 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -77,27 +77,27 @@ static void testInitialize(void) /* SpLsaModeInitialize does not care about the LSA version. */ status = pSpLsaModeInitialize(0, &Version, &pTables2, &cTables); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(cTables == 2 || broken(cTables == 1), /* Win2k */ - "cTables: %d\n", cTables); + "cTables: %ld\n", cTables); ok(pTables2 != NULL,"pTables: %p\n", pTables2); /* We can call it as many times we want. */ status = pSpLsaModeInitialize(0x10000, &Version, &pTables, &cTables); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(cTables == 2 || broken(cTables == 1), /* Win2k */ - "cTables: %d\n", cTables); + "cTables: %ld\n", cTables); ok(pTables != NULL, "pTables: %p\n", pTables); /* It will always return the same pointer. */ ok(pTables == pTables2, "pTables: %p, pTables2: %p\n", pTables, pTables2); status = pSpLsaModeInitialize(0x23456, &Version, &pTables, &cTables); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(cTables == 2 || broken(cTables == 1), /* Win2k */ - "cTables: %d\n", cTables); + "cTables: %ld\n", cTables); ok(pTables != NULL, "pTables: %p\n", pTables); ok(pTables == pTables2, "pTables: %p, pTables2: %p\n", pTables, pTables2); @@ -106,32 +106,32 @@ static void testInitialize(void) cUserTables = 0xdead; pUserTables = NULL; status = pSpUserModeInitialize(0, &Version, &pUserTables, &cUserTables); - ok(status == STATUS_INVALID_PARAMETER, "status: 0x%x\n", status); - ok(Version == 0xdead, "Version: 0x%x\n", Version); - ok(cUserTables == 0xdead, "cTables: %d\n", cUserTables); + ok(status == STATUS_INVALID_PARAMETER, "status: 0x%lx\n", status); + ok(Version == 0xdead, "Version: 0x%lx\n", Version); + ok(cUserTables == 0xdead, "cTables: %ld\n", cUserTables); ok(pUserTables == NULL, "pUserTables: %p\n", pUserTables); status = pSpUserModeInitialize(0x20000, &Version, &pUserTables, &cUserTables); - ok(status == STATUS_INVALID_PARAMETER, "status: 0x%x\n", status); - ok(Version == 0xdead, "Version: 0x%x\n", Version); - ok(cUserTables == 0xdead, "cTables: %d\n", cUserTables); + ok(status == STATUS_INVALID_PARAMETER, "status: 0x%lx\n", status); + ok(Version == 0xdead, "Version: 0x%lx\n", Version); + ok(cUserTables == 0xdead, "cTables: %ld\n", cUserTables); ok(pUserTables == NULL, "pUserTables: %p\n", pUserTables); /* Good version to SpUserModeInitialize */ status = pSpUserModeInitialize(SECPKG_INTERFACE_VERSION, &Version, &pUserTables, &cUserTables); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); - ok(Version == SECPKG_INTERFACE_VERSION, "Version: 0x%x\n", Version); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); + ok(Version == SECPKG_INTERFACE_VERSION, "Version: 0x%lx\n", Version); ok(cUserTables == 2 || broken(cUserTables == 4), /* Win2k */ - "cUserTables: %d\n", cUserTables); + "cUserTables: %ld\n", cUserTables); ok(pUserTables != NULL, "pUserTables: %p\n", pUserTables); /* Initializing user again */ status = pSpUserModeInitialize(SECPKG_INTERFACE_VERSION, &Version, &pUserTables2, &cTables); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(pUserTables == pUserTables2, "pUserTables: %p, pUserTables2: %p\n", pUserTables, pUserTables2); } @@ -161,7 +161,7 @@ static PSECPKG_FUNCTION_TABLE getNextSecPkgTable(PSECPKG_FUNCTION_TABLE pTable, else if (Version == SECPKG_INTERFACE_VERSION_8) size = SECPKG_FUNCTION_TABLE_SIZE_8; else { - ok(FALSE, "Unknown package version 0x%x\n", Version); + ok(FALSE, "Unknown package version 0x%lx\n", Version); return NULL; } @@ -217,21 +217,21 @@ static void testGetInfo(void) /* Get the dispatch table */ status = pSpLsaModeInitialize(0, &Version, &pTables, &cTables); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); /* Passing NULL into ->GetInfo causes a crash. */ /* First package: Unified */ status = pTables->GetInfo(&PackageInfo); - ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); + ok(status == STATUS_SUCCESS, "status: 0x%lx\n", status); ok(PackageInfo.fCapabilities == LSA_BASE_CAPS || PackageInfo.fCapabilities == (LSA_BASE_CAPS|SECPKG_FLAG_APPCONTAINER_PASSTHROUGH), - "fCapabilities: 0x%x\n", PackageInfo.fCapabilities); + "fCapabilities: 0x%lx\n", PackageInfo.fCapabilities); ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); ok(PackageInfo.cbMaxToken == 0x4000 || PackageInfo.cbMaxToken == 0x6000, /* Vista */ - "cbMaxToken: 0x%x\n", + "cbMaxToken: 0x%lx\n", PackageInfo.cbMaxToken); /* Second package */ @@ -251,18 +251,18 @@ static void testGetInfo(void) status = pTables->GetInfo(&PackageInfo); ok(SUCCEEDED(status) || status == SEC_E_UNSUPPORTED_FUNCTION, /* win2k3 */ - "status: 0x%x\n", status); + "status: 0x%lx\n", status); if (SUCCEEDED(status)) { ok(PackageInfo.fCapabilities == LSA_BASE_CAPS || PackageInfo.fCapabilities == (LSA_BASE_CAPS|SECPKG_FLAG_APPCONTAINER_PASSTHROUGH), - "fCapabilities: 0x%x\n", PackageInfo.fCapabilities); + "fCapabilities: 0x%lx\n", PackageInfo.fCapabilities); ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); ok(PackageInfo.cbMaxToken == 0x4000 || PackageInfo.cbMaxToken == 0x6000, /* Win7 */ - "cbMaxToken: 0x%x\n", + "cbMaxToken: 0x%lx\n", PackageInfo.cbMaxToken); } }

1 0