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

Jacek Caban : user32: Use ACCEL struct in accelerator object.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: dadace10ec7bd9768037b78a5613bbbc724cef1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dadace10ec7bd9768037b78a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 2 15:05:44 2022 +0100 user32: Use ACCEL struct in accelerator object. Instead of PE_ACCEL. 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/resource.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 81f717c29cc..912b7f95227 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -46,7 +46,7 @@ struct accelerator { struct user_object obj; unsigned int count; - PE_ACCEL table[1]; + ACCEL table[1]; }; /********************************************************************** @@ -55,19 +55,25 @@ struct accelerator HACCEL WINAPI LoadAcceleratorsW(HINSTANCE instance, LPCWSTR name) { struct accelerator *accel; - const PE_ACCEL *table; + const PE_ACCEL *pe_table; + unsigned int i; HRSRC rsrc; HACCEL handle; DWORD count; if (!(rsrc = FindResourceW( instance, name, (LPWSTR)RT_ACCELERATOR ))) return 0; - table = LoadResource( instance, rsrc ); - count = SizeofResource( instance, rsrc ) / sizeof(*table); + pe_table = LoadResource( instance, rsrc ); + count = SizeofResource( instance, rsrc ) / sizeof(*pe_table); if (!count) return 0; accel = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct accelerator, table[count] )); if (!accel) return 0; accel->count = count; - memcpy( accel->table, table, count * sizeof(*table) ); + for (i = 0; i < count; i++) + { + accel->table[i].fVirt = pe_table[i].fVirt; + accel->table[i].key = pe_table[i].key; + accel->table[i].cmd = pe_table[i].cmd; + } if (!(handle = alloc_user_handle( &accel->obj, NTUSER_OBJ_ACCEL ))) HeapFree( GetProcessHeap(), 0, accel ); TRACE_(accel)("%p %s returning %p\n", instance, debugstr_w(name), handle ); @@ -185,7 +191,6 @@ HACCEL WINAPI CreateAcceleratorTableW(LPACCEL lpaccel, INT count) { struct accelerator *accel; HACCEL handle; - int i; if (count < 1) { @@ -195,12 +200,8 @@ HACCEL WINAPI CreateAcceleratorTableW(LPACCEL lpaccel, INT count) accel = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct accelerator, table[count] )); if (!accel) return 0; accel->count = count; - for (i = 0; i < count; i++) - { - accel->table[i].fVirt = lpaccel[i].fVirt; - accel->table[i].key = lpaccel[i].key; - accel->table[i].cmd = lpaccel[i].cmd; - } + memcpy( accel->table, lpaccel, count * sizeof(*lpaccel) ); + if (!(handle = alloc_user_handle( &accel->obj, NTUSER_OBJ_ACCEL ))) HeapFree( GetProcessHeap(), 0, accel ); TRACE_(accel)("returning %p\n", handle );

1 0

Alexandre Julliard : winebuild: Align raw data size instead of virtual size in PE sections.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: 603130cc3837524b3c2f6d4338261c3b8ea802ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=603130cc3837524b3c2f6d43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 2 10:53:23 2022 +0100 winebuild: Align raw data size instead of virtual size in PE sections. Use the aligned size to set code/data sizes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index ca3c861e60f..c09e58084cc 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -796,7 +796,6 @@ static struct unsigned int file_align; unsigned int sec_count; unsigned int exp_count; - unsigned int code_size; struct dir_data dir[16]; struct sec_data sec[8]; struct exp_data exp[8]; @@ -1031,10 +1030,14 @@ static void output_apiset_section( const struct apiset *apiset ) static void output_pe_file( DLLSPEC *spec, const char signature[32] ) { const unsigned int lfanew = 0x40 + 32; - unsigned int i; + unsigned int i, code_size = 0, data_size = 0; init_output_buffer(); + for (i = 0; i < pe.sec_count; i++) + if (pe.sec[i].flags & 0x20) /* CNT_CODE */ + code_size += pe.sec[i].file_size; + /* .rsrc section */ if (spec->type == SPEC_WIN32) { @@ -1044,7 +1047,7 @@ static void output_pe_file( DLLSPEC *spec, const char signature[32] ) } /* .reloc section */ - if (pe.code_size) + if (code_size) { put_dword( 0 ); /* VirtualAddress */ put_dword( 0 ); /* Size */ @@ -1052,6 +1055,10 @@ static void output_pe_file( DLLSPEC *spec, const char signature[32] ) 0x42000040 /* CNT_INITIALIZED_DATA|MEM_DISCARDABLE|MEM_READ */ ); } + for (i = 0; i < pe.sec_count; i++) + if ((pe.sec[i].flags & 0x60) == 0x40) /* CNT_INITIALIZED_DATA */ + data_size += pe.sec[i].file_size; + put_word( 0x5a4d ); /* e_magic */ put_word( 0x40 ); /* e_cblp */ put_word( 0x01 ); /* e_cp */ @@ -1100,11 +1107,11 @@ static void output_pe_file( DLLSPEC *spec, const char signature[32] ) IMAGE_NT_OPTIONAL_HDR32_MAGIC ); /* Magic */ put_byte( 7 ); /* MajorLinkerVersion */ put_byte( 10 ); /* MinorLinkerVersion */ - put_dword( pe.code_size ); /* SizeOfCode */ - put_dword( 0 ); /* SizeOfInitializedData */ + put_dword( code_size ); /* SizeOfCode */ + put_dword( data_size ); /* SizeOfInitializedData */ put_dword( 0 ); /* SizeOfUninitializedData */ - put_dword( pe.code_size ? pe.sec[0].rva : 0 ); /* AddressOfEntryPoint */ - put_dword( pe.code_size ? pe.sec[0].rva : 0 ); /* BaseOfCode */ + put_dword( code_size ? pe.sec[0].rva : 0 ); /* AddressOfEntryPoint */ + put_dword( code_size ? pe.sec[0].rva : 0 ); /* BaseOfCode */ if (get_ptr_size() == 4) put_dword( 0 ); /* BaseOfData */ put_pword( 0x10000000 ); /* ImageBase */ put_dword( pe.section_align ); /* SectionAlignment */ @@ -1139,9 +1146,9 @@ static void output_pe_file( DLLSPEC *spec, const char signature[32] ) for (i = 0; i < pe.sec_count; i++) { put_data( pe.sec[i].name, 8 ); /* Name */ - put_dword( pe.sec[i].virt_size ); /* VirtualSize */ + put_dword( pe.sec[i].size ); /* VirtualSize */ put_dword( pe.sec[i].rva ); /* VirtualAddress */ - put_dword( pe.sec[i].size ); /* SizeOfRawData */ + put_dword( pe.sec[i].file_size ); /* SizeOfRawData */ put_dword( pe.sec[i].filepos ); /* PointerToRawData */ put_dword( 0 ); /* PointerToRelocations */ put_dword( 0 ); /* PointerToLinenumbers */ @@ -1149,12 +1156,13 @@ static void output_pe_file( DLLSPEC *spec, const char signature[32] ) put_word( 0 ); /* NumberOfLinenumbers */ put_dword( pe.sec[i].flags ); /* Characteristics */ } + align_output( pe.file_align ); /* section data */ for (i = 0; i < pe.sec_count; i++) { - align_output( pe.file_align ); put_data( pe.sec[i].ptr, pe.sec[i].size ); + align_output( pe.file_align ); } flush_output_buffer( output_file_name ? output_file_name : spec->file_name ); @@ -1182,7 +1190,6 @@ void output_fake_module( DLLSPEC *spec ) /* .text section */ if (spec->characteristics & IMAGE_FILE_DLL) put_data( dll_code_section, sizeof(dll_code_section) ); else put_data( exe_code_section, sizeof(exe_code_section) ); - pe.code_size = output_buffer_pos; flush_output_to_section( ".text", -1, 0x60000020 /* CNT_CODE|MEM_EXECUTE|MEM_READ */ ); if (spec->type == SPEC_WIN16)

1 0

Alexandre Julliard : configure: Require PE cross-compilation for building on ARM64.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: 11486a7b48aa43421ada5a557d892feabf27b372 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11486a7b48aa43421ada5a55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 2 20:06:16 2022 +0100 configure: Require PE cross-compilation for building on ARM64. There's no -mabi=ms option we could use on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 32 ++++---------------------------- configure.ac | 8 ++++---- 2 files changed, 8 insertions(+), 32 deletions(-) diff --git a/configure b/configure index d757194be45..397bc7b71c5 100755 --- a/configure +++ b/configure @@ -6360,34 +6360,6 @@ printf "%s\n" "$wine_cv_float_abi" >&6; } TARGETFLAGS="$TARGETFLAGS -mfloat-abi=$float_abi" ;; aarch64*) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports __builtin_ms_va_list" >&5 -printf %s "checking whether $CC supports __builtin_ms_va_list... " >&6; } -if test ${wine_cv_builtin_ms_va_list+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdarg.h> -int -main (void) -{ -void func(__builtin_ms_va_list *args); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - wine_cv_builtin_ms_va_list=yes -else $as_nop - wine_cv_builtin_ms_va_list=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wine_cv_builtin_ms_va_list" >&5 -printf "%s\n" "$wine_cv_builtin_ms_va_list" >&6; } - test $wine_cv_builtin_ms_va_list != no || as_fn_error $? "You need clang >= 5.0 to build Wine for arm64." "$LINENO" 5 enable_wow64=${enable_wow64:-yes} enable_wow64win=${enable_wow64win:-yes} ;; @@ -11794,6 +11766,10 @@ esac fi +case $host_cpu in + aarch64*) test "x$CROSSTARGET" != x || as_fn_error $? "PE cross-compilation is required for ARM64, please install llvm-mingw." "$LINENO" 5 ;; +esac + if test "x$with_system_dllpath" != "x" -a "$CROSSCC" != "false" then diff --git a/configure.ac b/configure.ac index 7881af45e5b..a9d3ff9a85c 100644 --- a/configure.ac +++ b/configure.ac @@ -193,10 +193,6 @@ case $host in TARGETFLAGS="$TARGETFLAGS -mfloat-abi=$float_abi" ;; aarch64*) - AC_CACHE_CHECK([whether $CC supports __builtin_ms_va_list],wine_cv_builtin_ms_va_list, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]], [[void func(__builtin_ms_va_list *args);]])], - [wine_cv_builtin_ms_va_list=yes],[wine_cv_builtin_ms_va_list=no])]) - test $wine_cv_builtin_ms_va_list != no || AC_MSG_ERROR([You need clang >= 5.0 to build Wine for arm64.]) enable_wow64=${enable_wow64:-yes} enable_wow64win=${enable_wow64win:-yes} ;; @@ -995,6 +991,10 @@ fi WINE_NOTICE_WITH(mingw,[test "x$CROSSTARGET" = "x"], [MinGW compiler not found, cross-compiling PE files won't be supported.]) +case $host_cpu in + aarch64*) test "x$CROSSTARGET" != x || AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install llvm-mingw.]) ;; +esac + dnl **** External libraries **** if test "x$with_system_dllpath" != "x" -a "$CROSSCC" != "false"

1 0

Eric Pouech : kernel32/tests/actctx: Enable compilation with long types.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: bc2df6820ceedde7a17f22f01a1f6348f26b4a97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc2df6820ceedde7a17f22f0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:03:01 2022 +0100 kernel32/tests/actctx: 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/actctx.c | 605 ++++++++++++++++++++++--------------------- 1 file changed, 303 insertions(+), 302 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bc2df6820ceedde7a17f…

1 0

Eric Pouech : kernel32/tests/codepage: Enable compilation with long types.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: 34227cb7e6d0634e87fce31952dc157c2f311b7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=34227cb7e6d0634e87fce319… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:03:09 2022 +0100 kernel32/tests/codepage: 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/codepage.c | 187 +++++++++++++++++++++-------------------- 1 file changed, 94 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=34227cb7e6d0634e87fc…

1 0

Eric Pouech : kernel32/tests/comm: Enable compilation with long types.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: 3d873a7fc5087b784aa3dfd1f64c38a30866ed60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d873a7fc5087b784aa3dfd1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:03:15 2022 +0100 kernel32/tests/comm: 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/comm.c | 353 +++++++++++++++++++++++---------------------- 1 file changed, 177 insertions(+), 176 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d873a7fc5087b784aa3…

1 0

Eric Pouech : kernel32/tests/console: Enable compilation with long types.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: 219ff69ae27500b32e180a27e2355f79e719f687 URL: https://source.winehq.org/git/wine.git/?a=commit;h=219ff69ae27500b32e180a27… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:03:21 2022 +0100 kernel32/tests/console: 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/console.c | 881 +++++++++++++++++++++--------------------- 1 file changed, 441 insertions(+), 440 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=219ff69ae27500b32e18…

1 0

Eric Pouech : ninput/tests: Enable compilation with long types.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: a5286b87b8e2bbb97eb3205a04891f3fecbb257b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5286b87b8e2bbb97eb3205a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:03:27 2022 +0100 ninput/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/ninput/tests/Makefile.in | 1 - dlls/ninput/tests/ninput.c | 48 +++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/ninput/tests/Makefile.in b/dlls/ninput/tests/Makefile.in index 6ff69c9ba4f..9c0b44fa17d 100644 --- a/dlls/ninput/tests/Makefile.in +++ b/dlls/ninput/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ninput.dll IMPORTS = ninput diff --git a/dlls/ninput/tests/ninput.c b/dlls/ninput/tests/ninput.c index 7fd389378b0..54ea6f0b34b 100644 --- a/dlls/ninput/tests/ninput.c +++ b/dlls/ninput/tests/ninput.c @@ -25,14 +25,14 @@ static void test_context(void) HRESULT hr; hr = CreateInteractionContext(&context); - ok(hr == S_OK, "Failed to create context, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create context, hr %#lx.\n", hr); hr = DestroyInteractionContext(context); - ok(hr == S_OK, "Failed to destroy context, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to destroy context, hr %#lx.\n", hr); hr = CreateInteractionContext(NULL); - ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#lx.\n", hr); hr = DestroyInteractionContext(NULL); - ok(hr == E_HANDLE, "Got hr %#x.\n", hr); + ok(hr == E_HANDLE, "Got hr %#lx.\n", hr); } static void test_properties(void) @@ -42,44 +42,44 @@ static void test_properties(void) HRESULT hr; hr = CreateInteractionContext(&context); - ok(hr == S_OK, "Failed to create context, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create context, hr %#lx.\n", hr); hr = GetPropertyInteractionContext(context, INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS, &value); - ok(hr == S_OK, "Failed to get property, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get property, hr %#lx.\n", hr); ok(value == TRUE, "Got unexpected value %#x.\n", value); hr = SetPropertyInteractionContext(context, INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS, TRUE); - ok(hr == S_OK, "Failed to set property, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set property, hr %#lx.\n", hr); hr = GetPropertyInteractionContext(context, INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS, &value); - ok(hr == S_OK, "Failed to get property, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get property, hr %#lx.\n", hr); ok(value == TRUE, "Got unexpected value %#x.\n", value); hr = SetPropertyInteractionContext(context, INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS, FALSE); - ok(hr == S_OK, "Failed to set property, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set property, hr %#lx.\n", hr); hr = GetPropertyInteractionContext(context, INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS, &value); - ok(hr == S_OK, "Failed to get property, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get property, hr %#lx.\n", hr); ok(value == FALSE, "Got unexpected value %#x.\n", value); hr = SetPropertyInteractionContext(context, INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS, 2); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = SetPropertyInteractionContext(context, INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS, 3); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = SetPropertyInteractionContext(context, 0xdeadbeef, 0); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = GetPropertyInteractionContext(context, 0xdeadbeef, &value); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = GetPropertyInteractionContext(context, INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS, NULL); - ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#lx.\n", hr); hr = SetPropertyInteractionContext(NULL, INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS, FALSE); - ok(hr == E_HANDLE, "Got hr %#x.\n", hr); + ok(hr == E_HANDLE, "Got hr %#lx.\n", hr); hr = GetPropertyInteractionContext(NULL, INTERACTION_CONTEXT_PROPERTY_FILTER_POINTERS, &value); - ok(hr == E_HANDLE, "Got hr %#x.\n", hr); + ok(hr == E_HANDLE, "Got hr %#lx.\n", hr); hr = DestroyInteractionContext(context); - ok(hr == S_OK, "Failed to destroy context, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to destroy context, hr %#lx.\n", hr); } static void test_configuration(void) @@ -101,20 +101,20 @@ static void test_configuration(void) }; hr = CreateInteractionContext(&context); - ok(hr == S_OK, "Failed to create context, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create context, hr %#lx.\n", hr); hr = SetInteractionConfigurationInteractionContext(NULL, 0, NULL); - ok(hr == E_HANDLE, "Got hr %#x.\n", hr); + ok(hr == E_HANDLE, "Got hr %#lx.\n", hr); hr = SetInteractionConfigurationInteractionContext(context, 0, NULL); - ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = SetInteractionConfigurationInteractionContext(context, 1, NULL); - ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#lx.\n", hr); hr = SetInteractionConfigurationInteractionContext(context, ARRAY_SIZE(config), config); - ok(hr == S_OK, "Failed to set configuration, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set configuration, hr %#lx.\n", hr); hr = DestroyInteractionContext(context); - ok(hr == S_OK, "Failed to destroy context, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to destroy context, hr %#lx.\n", hr); } START_TEST(ninput)

1 0

Eric Pouech : ntdsapi/tests: Enable compilation with long types.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: a43f500643ea4e56619b8bc2c150e8c5e6144204 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a43f500643ea4e56619b8bc2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:03:39 2022 +0100 ntdsapi/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/ntdsapi/tests/Makefile.in | 1 - dlls/ntdsapi/tests/ntdsapi.c | 38 +++++++++++++++++++------------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/ntdsapi/tests/Makefile.in b/dlls/ntdsapi/tests/Makefile.in index 83373504312..5a895e3b682 100644 --- a/dlls/ntdsapi/tests/Makefile.in +++ b/dlls/ntdsapi/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ntdsapi.dll IMPORTS = ntdsapi diff --git a/dlls/ntdsapi/tests/ntdsapi.c b/dlls/ntdsapi/tests/ntdsapi.c index 77dd675fc97..6bf50ae6b8f 100644 --- a/dlls/ntdsapi/tests/ntdsapi.c +++ b/dlls/ntdsapi/tests/ntdsapi.c @@ -47,41 +47,41 @@ static void test_DsMakeSpn(void) spn_length = ARRAY_SIZE(spn); ret = DsMakeSpnW(NULL, NULL, NULL, 0, NULL, &spn_length, spn); - ok(ret == ERROR_INVALID_PARAMETER, "DsMakeSpnW should have failed with ERROR_INVALID_PARAMETER instead of %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "DsMakeSpnW should have failed with ERROR_INVALID_PARAMETER instead of %ld\n", ret); spn_length = ARRAY_SIZE(spn); ret = DsMakeSpnW(NULL, wszServiceHost, NULL, 0, NULL, &spn_length, spn); - ok(ret == ERROR_INVALID_PARAMETER, "DsMakeSpnW should have failed with ERROR_INVALID_PARAMETER instead of %d\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "DsMakeSpnW should have failed with ERROR_INVALID_PARAMETER instead of %ld\n", ret); spn_length = ARRAY_SIZE(spn); ret = DsMakeSpnW(wszServiceClass, wszServiceHost, NULL, 0, NULL, &spn_length, spn); - ok(ret == ERROR_SUCCESS, "DsMakeSpnW should have succeeded instead of failing with %d\n", ret); + ok(ret == ERROR_SUCCESS, "DsMakeSpnW should have succeeded instead of failing with %ld\n", ret); ok(!lstrcmpW(spn, wszSpn1), "DsMakeSpnW returned unexpected SPN %s\n", wine_dbgstr_w(spn)); - ok(spn_length == lstrlenW(wszSpn1) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %d\n", lstrlenW(wszSpn1) + 1, spn_length); + ok(spn_length == lstrlenW(wszSpn1) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %ld\n", lstrlenW(wszSpn1) + 1, spn_length); spn_length = ARRAY_SIZE(spn); ret = DsMakeSpnW(wszServiceClass, wszServiceHost, wszInstanceName, 0, NULL, &spn_length, spn); - ok(ret == ERROR_SUCCESS, "DsMakeSpnW should have succeeded instead of failing with %d\n", ret); + ok(ret == ERROR_SUCCESS, "DsMakeSpnW should have succeeded instead of failing with %ld\n", ret); ok(!lstrcmpW(spn, wszSpn2), "DsMakeSpnW returned unexpected SPN %s\n", wine_dbgstr_w(spn)); - ok(spn_length == lstrlenW(wszSpn2) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %d\n", lstrlenW(wszSpn2) + 1, spn_length); + ok(spn_length == lstrlenW(wszSpn2) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %ld\n", lstrlenW(wszSpn2) + 1, spn_length); spn_length = ARRAY_SIZE(spn); ret = DsMakeSpnW(wszServiceClass, wszServiceHost, wszInstanceName, 555, NULL, &spn_length, spn); - ok(ret == ERROR_SUCCESS, "DsMakeSpnW should have succeeded instead of failing with %d\n", ret); + ok(ret == ERROR_SUCCESS, "DsMakeSpnW should have succeeded instead of failing with %ld\n", ret); ok(!lstrcmpW(spn, wszSpn3), "DsMakeSpnW returned unexpected SPN %s\n", wine_dbgstr_w(spn)); - ok(spn_length == lstrlenW(wszSpn3) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %d\n", lstrlenW(wszSpn3) + 1, spn_length); + ok(spn_length == lstrlenW(wszSpn3) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %ld\n", lstrlenW(wszSpn3) + 1, spn_length); spn_length = ARRAY_SIZE(spn); ret = DsMakeSpnW(wszServiceClass, wszServiceHost, wszInstanceName, 555, wszReferrer, &spn_length, spn); - ok(ret == ERROR_SUCCESS, "DsMakeSpnW should have succeeded instead of failing with %d\n", ret); + ok(ret == ERROR_SUCCESS, "DsMakeSpnW should have succeeded instead of failing with %ld\n", ret); ok(!lstrcmpW(spn, wszSpn4), "DsMakeSpnW returned unexpected SPN %s\n", wine_dbgstr_w(spn)); - ok(spn_length == lstrlenW(wszSpn4) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %d\n", lstrlenW(wszSpn4) + 1, spn_length); + ok(spn_length == lstrlenW(wszSpn4) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %ld\n", lstrlenW(wszSpn4) + 1, spn_length); spn_length = ARRAY_SIZE(spn); ret = DsMakeSpnW(wszServiceClass, wszServiceHost, NULL, 555, wszReferrer, &spn_length, spn); - ok(ret == ERROR_SUCCESS, "DsMakeSpnW should have succeeded instead of failing with %d\n", ret); + ok(ret == ERROR_SUCCESS, "DsMakeSpnW should have succeeded instead of failing with %ld\n", ret); ok(!lstrcmpW(spn, wszSpn5), "DsMakeSpnW returned unexpected SPN %s\n", wine_dbgstr_w(spn)); - ok(spn_length == lstrlenW(wszSpn5) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %d\n", lstrlenW(wszSpn5) + 1, spn_length); + ok(spn_length == lstrlenW(wszSpn5) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %ld\n", lstrlenW(wszSpn5) + 1, spn_length); } static void test_DsClientMakeSpnForTargetServer(void) @@ -93,24 +93,24 @@ static void test_DsClientMakeSpnForTargetServer(void) WCHAR buf[256]; ret = DsClientMakeSpnForTargetServerW( NULL, NULL, NULL, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ok( ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret ); ret = DsClientMakeSpnForTargetServerW( classW, NULL, NULL, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ok( ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret ); ret = DsClientMakeSpnForTargetServerW( classW, hostW, NULL, NULL ); - ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + ok( ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret ); len = 0; ret = DsClientMakeSpnForTargetServerW( classW, hostW, &len, NULL ); - ok( ret == ERROR_BUFFER_OVERFLOW, "got %u\n", ret ); - ok( len == lstrlenW(resultW) + 1, "got %u\n", len ); + ok( ret == ERROR_BUFFER_OVERFLOW, "got %lu\n", ret ); + ok( len == lstrlenW(resultW) + 1, "got %lu\n", len ); len = ARRAY_SIZE(buf); buf[0] = 0; ret = DsClientMakeSpnForTargetServerW( classW, hostW, &len, buf ); - ok( ret == ERROR_SUCCESS, "got %u\n", ret ); - ok( len == lstrlenW(resultW) + 1, "got %u\n", len ); + ok( ret == ERROR_SUCCESS, "got %lu\n", ret ); + ok( len == lstrlenW(resultW) + 1, "got %lu\n", len ); ok( !lstrcmpW( buf, resultW ), "wrong data\n" ); }

1 0

Eric Pouech : ntoskrnl.exe/tests: Use correct integral type.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: 42471938320bd6e3b5d8e85e68f7ec0522361894 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42471938320bd6e3b5d8e85e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:03:45 2022 +0100 ntoskrnl.exe/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 9126e3cf2bf..34dfdca476c 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -55,8 +55,8 @@ struct test_data int running_under_wine; int winetest_report_success; int winetest_debug; - int failures; - int todo_failures; + LONG failures; + LONG todo_failures; }; struct main_test_input

1 0