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

Alexandre Julliard : mlang: Skip locales that can't be converted to rfc1766 format.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: f324021e6854ef7d228fd20a9c8fa32d6695efdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f324021e6854ef7d228fd20a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 17:31:30 2022 +0100 mlang: Skip locales that can't be converted to rfc1766 format. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 5d89a051e09..8a062971dc4 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2403,7 +2403,7 @@ static BOOL CALLBACK enum_locales_proc(LPWSTR locale, DWORD flags, LPARAM lparam if (info->lcid == LOCALE_CUSTOM_UNSPECIFIED) return TRUE; info->wszRfc1766[0] = 0; - lcid_to_rfc1766W( info->lcid, info->wszRfc1766, MAX_RFC1766_NAME ); + if (FAILED( lcid_to_rfc1766W( info->lcid, info->wszRfc1766, MAX_RFC1766_NAME ))) return TRUE; info->wszLocaleName[0] = 0; GetLocaleInfoW(info->lcid, LOCALE_SLANGUAGE, info->wszLocaleName, MAX_LOCALE_NAME);

1 0

Jacek Caban : win32u: Move message spy implementation from user32.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 6b3da8a4d8fe4d9cdb82e8c52c1548166c00bf5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b3da8a4d8fe4d9cdb82e8c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 21 16:42:08 2022 +0100 win32u: Move message spy 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/Makefile.in | 1 - dlls/user32/user_main.c | 21 ++++++++ dlls/user32/user_private.h | 7 --- dlls/win32u/Makefile.in | 1 + dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 6 +++ dlls/win32u/ntuser_private.h | 15 ++++++ dlls/{user32 => win32u}/spy.c | 109 +++++++++++++++++++++++------------------- dlls/win32u/sysparams.c | 2 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 3 ++ dlls/win32u/window.c | 4 +- dlls/win32u/wrappers.c | 7 +++ include/ntuser.h | 5 ++ 14 files changed, 124 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6b3da8a4d8fe4d9cdb82…

1 0

Alexandre Julliard : wow64: Add a wrapper for NtInitializeNlsFiles().
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 4258f98244f21cb80a588c4ebaaff738ec9b01f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4258f98244f21cb80a588c4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 11:51:41 2022 +0100 wow64: Add a wrapper for NtInitializeNlsFiles(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.h | 1 + dlls/wow64/virtual.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 0c2ba574031..a3af9174c49 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -97,6 +97,7 @@ SYSCALL_ENTRY( NtGetNlsSectionPtr ) \ SYSCALL_ENTRY( NtGetWriteWatch ) \ SYSCALL_ENTRY( NtImpersonateAnonymousToken ) \ + SYSCALL_ENTRY( NtInitializeNlsFiles ) \ SYSCALL_ENTRY( NtInitiatePowerAction ) \ SYSCALL_ENTRY( NtIsProcessInJob ) \ SYSCALL_ENTRY( NtListenPort ) \ diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index fc470c07923..e89373f4239 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -208,6 +208,24 @@ NTSTATUS WINAPI wow64_NtGetWriteWatch( UINT *args ) } +/********************************************************************** + * wow64_NtInitializeNlsFiles + */ +NTSTATUS WINAPI wow64_NtInitializeNlsFiles( UINT *args ) +{ + ULONG *addr32 = get_ptr( &args ); + LCID *lcid = get_ptr( &args ); + LARGE_INTEGER *size = get_ptr( &args ); + + void *addr; + NTSTATUS status; + + status = NtInitializeNlsFiles( addr_32to64( &addr, addr32 ), lcid, size ); + if (!status) put_addr( addr32, addr ); + return status; +} + + /********************************************************************** * wow64_NtLockVirtualMemory */

1 0

Alexandre Julliard : ntdll: Implement RtlGetLocaleFileMappingAddress().
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: c13d88ba971c540c525ab9adbbd1d663cf6fc6d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c13d88ba971c540c525ab9ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 11:52:22 2022 +0100 ntdll: Implement RtlGetLocaleFileMappingAddress(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 23 +++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 1 + 3 files changed, 25 insertions(+) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index fe185d403f2..360496dd7e1 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -701,6 +701,29 @@ void WINAPI RtlResetRtlTranslations( const NLSTABLEINFO *info ) } +/************************************************************************** + * RtlGetLocaleFileMappingAddress (NTDLL.@) + */ +NTSTATUS WINAPI RtlGetLocaleFileMappingAddress( void **ptr, LCID *lcid, LARGE_INTEGER *size ) +{ + static void *cached_ptr; + static LCID cached_lcid; + + if (!cached_ptr) + { + void *addr; + NTSTATUS status = NtInitializeNlsFiles( &addr, &cached_lcid, size ); + + if (status) return status; + if (InterlockedCompareExchangePointer( &cached_ptr, addr, NULL )) + NtUnmapViewOfSection( GetCurrentProcess(), addr ); + } + *ptr = cached_ptr; + *lcid = cached_lcid; + return STATUS_SUCCESS; +} + + /************************************************************************** * RtlAnsiCharToUnicodeChar (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6d134770596..4c7b9be1d9f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -726,6 +726,7 @@ # @ stub RtlGetLengthWithoutLastFullDosOrNtPathElement # Yes, Microsoft really misspelled this one! # @ stub RtlGetLengthWithoutTrailingPathSeperators +@ stdcall RtlGetLocaleFileMappingAddress(ptr ptr ptr) @ stdcall RtlGetLongestNtPathLength() @ stdcall -syscall -arch=win32 RtlGetNativeSystemInformation(long ptr long ptr) NtWow64GetNativeSystemInformation @ stdcall -syscall -arch=win64 RtlGetNativeSystemInformation(long ptr long ptr) NtQuerySystemInformation diff --git a/include/winternl.h b/include/winternl.h index 68c174d6086..3fa5fad9b46 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4346,6 +4346,7 @@ NTSYSAPI ULONG WINAPI RtlGetFullPathName_U(PCWSTR,ULONG,PWSTR,PWSTR*); NTSYSAPI NTSTATUS WINAPI RtlGetGroupSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID *,PBOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlGetLastNtStatus(void); NTSYSAPI DWORD WINAPI RtlGetLastWin32Error(void); +NTSYSAPI NTSTATUS WINAPI RtlGetLocaleFileMappingAddress(void**,LCID*,LARGE_INTEGER*); NTSYSAPI DWORD WINAPI RtlGetLongestNtPathLength(void); NTSYSAPI ULONG WINAPI RtlGetNtGlobalFlags(void); NTSYSAPI BOOLEAN WINAPI RtlGetNtProductType(LPDWORD);

1 0

Paul Gofman : winhttp: Avoid freeing potentially uninitialized context in netconn_secure_connect().
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: bc4edb8a70a66c967b354c9b2bacc0804db6ba11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc4edb8a70a66c967b354c9b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 21 16:51:49 2022 +0300 winhttp: Avoid freeing potentially uninitialized context in netconn_secure_connect(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 2fc48476513..07a65c5465f 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -293,6 +293,7 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur if (!(read_buf = malloc( read_buf_size ))) return ERROR_OUTOFMEMORY; + memset( &ctx, 0, sizeof(ctx) ); status = InitializeSecurityContextW(cred_handle, NULL, hostname, isc_req_flags, 0, 0, NULL, 0, &ctx, &out_desc, &attrs, NULL);

1 0

Jacek Caban : user.exe: Use win32u directly for cursor icon handle support.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 0b87623819baec326cb48d605bc0087614cb8974 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b87623819baec326cb48d60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 21 14:14:30 2022 +0100 user.exe: Use win32u directly for cursor icon handle support. 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/user.exe16/message.c | 11 +++++------ dlls/user.exe16/user.c | 7 ++++--- dlls/user.exe16/user_private.h | 3 --- dlls/user32/controls.h | 6 ------ dlls/user32/cursoricon.c | 10 ---------- dlls/user32/user_main.c | 6 ------ dlls/user32/winproc.c | 3 --- 7 files changed, 9 insertions(+), 37 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 6d3de0f77e6..915585267d6 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -2590,17 +2590,15 @@ HWND create_window16( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE instance, } -/*********************************************************************** - * free_icon_param - */ -static void free_icon_param( ULONG_PTR param ) +static void WINAPI User16CallFreeIcon( ULONG *param, ULONG size ) { - GlobalFree16( LOWORD(param) ); + GlobalFree16( LOWORD(*param) ); } void register_wow_handlers(void) { + void **callback_table = NtCurrentTeb()->Peb->KernelCallbackTable; static const struct wow_handlers16 handlers16 = { button_proc16, @@ -2614,8 +2612,9 @@ void register_wow_handlers(void) create_window16, call_window_proc_Ato16, call_dialog_proc_Ato16, - free_icon_param }; + callback_table[NtUserCallFreeIcon] = User16CallFreeIcon; + UserRegisterWowHandlers( &handlers16, &wow_handlers32 ); } diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 4a56a67389b..39adb874125 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -31,6 +31,7 @@ #include "winbase.h" #include "wownt32.h" #include "user_private.h" +#include "ntuser.h" #include "wine/list.h" #include "wine/debug.h" @@ -299,7 +300,7 @@ static HICON store_icon_32( HICON16 icon16, HICON icon ) { memcpy( &ret, (char *)(ptr + 1) + and_size + xor_size, sizeof(ret) ); memcpy( (char *)(ptr + 1) + and_size + xor_size, &icon, sizeof(icon) ); - wow_handlers32.set_icon_param( icon, icon16 ); + NtUserCallTwoParam( HandleToUlong(icon), icon16, NtUserSetIconParam ); } release_icon_ptr( icon16, ptr ); } @@ -341,7 +342,7 @@ HICON get_icon_32( HICON16 icon16 ) DeleteObject( iinfo.hbmMask ); DeleteObject( iinfo.hbmColor ); memcpy( (char *)(ptr + 1) + xor_size + and_size, &ret, sizeof(ret) ); - wow_handlers32.set_icon_param( ret, icon16 ); + NtUserCallTwoParam( HandleToUlong(ret), icon16, NtUserSetIconParam ); } } release_icon_ptr( icon16, ptr ); @@ -352,7 +353,7 @@ HICON get_icon_32( HICON16 icon16 ) /* retrieve the 16-bit counterpart of a 32-bit icon, creating it if needed */ HICON16 get_icon_16( HICON icon ) { - HICON16 ret = wow_handlers32.get_icon_param( icon ); + HICON16 ret = NtUserCallOneParam( HandleToUlong(icon), NtUserGetIconParam ); if (!ret) { diff --git a/dlls/user.exe16/user_private.h b/dlls/user.exe16/user_private.h index afd75f0b096..83c57379d35 100644 --- a/dlls/user.exe16/user_private.h +++ b/dlls/user.exe16/user_private.h @@ -45,7 +45,6 @@ struct wow_handlers16 HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL); LRESULT (*call_window_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); LRESULT (*call_dialog_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); - void (*free_icon_param)(ULONG_PTR); }; struct wow_handlers32 @@ -63,8 +62,6 @@ struct wow_handlers32 WNDPROC (*alloc_winproc)(WNDPROC,BOOL); struct tagDIALOGINFO *(*get_dialog_info)(HWND,BOOL); INT (*dialog_box_loop)(HWND,HWND); - ULONG_PTR (*get_icon_param)(HICON); - ULONG_PTR (*set_icon_param)(HICON,ULONG_PTR); }; extern struct wow_handlers32 wow_handlers32 DECLSPEC_HIDDEN; diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 574143de438..47375590e29 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -73,7 +73,6 @@ struct wow_handlers16 HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL); LRESULT (*call_window_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); LRESULT (*call_dialog_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); - void (*free_icon_param)(ULONG_PTR); }; struct wow_handlers32 @@ -91,8 +90,6 @@ struct wow_handlers32 WNDPROC (*alloc_winproc)(WNDPROC,BOOL); struct tagDIALOGINFO *(*get_dialog_info)(HWND,BOOL); INT (*dialog_box_loop)(HWND,HWND); - ULONG_PTR (*get_icon_param)(HICON); - ULONG_PTR (*set_icon_param)(HICON,ULONG_PTR); }; extern struct wow_handlers16 wow_handlers DECLSPEC_HIDDEN; @@ -105,9 +102,6 @@ extern LRESULT MDIClientWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HI extern LRESULT ScrollBarWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN; extern LRESULT StaticWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN; -extern ULONG_PTR get_icon_param( HICON handle ) DECLSPEC_HIDDEN; -extern ULONG_PTR set_icon_param( HICON handle, ULONG_PTR param ) DECLSPEC_HIDDEN; - /* Class functions */ struct tagCLASS; /* opaque structure */ struct tagWND; diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index abf3a5dac53..9e6712f606b 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -79,16 +79,6 @@ static void free_icon_frame( struct cursoricon_frame *frame ) if (frame->mask) DeleteObject( frame->mask ); } -ULONG_PTR get_icon_param( HICON handle ) -{ - return NtUserCallOneParam( HandleToUlong(handle), NtUserGetIconParam ); -} - -ULONG_PTR set_icon_param( HICON handle, ULONG_PTR param ) -{ - return NtUserCallTwoParam( HandleToUlong(handle), param, NtUserSetIconParam ); -} - /*********************************************************************** * map_fileW diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 93274a773cc..88e2fc4eec1 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -185,11 +185,6 @@ static const struct user_callbacks user_funcs = unregister_imm, }; -static void WINAPI User32CallFreeIcon( ULONG *param, ULONG size ) -{ - wow_handlers.free_icon_param( *param ); -} - static BOOL WINAPI User32LoadDriver( const WCHAR *path, ULONG size ) { return LoadLibraryW( path ) != NULL; @@ -201,7 +196,6 @@ static const void *kernel_callback_table[NtUserCallCount] = User32CallWinEventHook, User32CallWindowsHook, User32LoadDriver, - User32CallFreeIcon, }; diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 1e12efe890b..cc547427270 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1031,8 +1031,6 @@ void WINAPI UserRegisterWowHandlers( const struct wow_handlers16 *new, struct wo orig->alloc_winproc = WINPROC_AllocProc; orig->get_dialog_info = DIALOG_get_info; orig->dialog_box_loop = DIALOG_DoDialogBox; - orig->get_icon_param = get_icon_param; - orig->set_icon_param = set_icon_param; wow_handlers = *new; } @@ -1050,7 +1048,6 @@ struct wow_handlers16 wow_handlers = WIN_CreateWindowEx, NULL, /* call_window_proc */ NULL, /* call_dialog_proc */ - NULL, /* free_icon_param */ }; static const struct user_client_procs client_procsA =

1 0

Alexandre Julliard : wow64win: Add missing syscall for NtUserGetAtomName().
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 90139001d401ca98abf9699ee51daf649e9c52a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90139001d401ca98abf9699e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 21 16:13:30 2022 +0100 wow64win: Add missing syscall for NtUserGetAtomName(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 7b6bbb5eda6..007459457b2 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -100,6 +100,7 @@ SYSCALL_ENTRY( NtUserDestroyAcceleratorTable ) \ SYSCALL_ENTRY( NtUserFindExistingCursorIcon ) \ SYSCALL_ENTRY( NtUserGetAncestor ) \ + SYSCALL_ENTRY( NtUserGetAtomName ) \ SYSCALL_ENTRY( NtUserGetClipboardFormatName ) \ SYSCALL_ENTRY( NtUserGetClipboardOwner ) \ SYSCALL_ENTRY( NtUserGetClipboardSequenceNumber ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 1a43b4793fb..fb237bfff47 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -189,6 +189,16 @@ NTSTATUS WINAPI wow64_NtUserRemoveProp( UINT *args ) return HandleToUlong( NtUserRemoveProp( hwnd, str )); } +NTSTATUS WINAPI wow64_NtUserGetAtomName( UINT *args ) +{ + ATOM atom = get_ulong( &args ); + UNICODE_STRING32 *str32 = get_ptr( &args ); + + UNICODE_STRING str; + + return NtUserGetAtomName( atom, unicode_str_32to64( &str, str32 )); +} + NTSTATUS WINAPI wow64_NtUserGetAncestor( UINT *args ) { HWND hwnd = get_handle( &args );

1 0

Hans Leidekker : bcrypt: Merge the various key import Unix calls into one.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: 0c2408464cfea0d3e5b073c56ac0d264d1abe576 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c2408464cfea0d3e5b073c5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 21 09:50:09 2022 +0100 bcrypt: Merge the various key import Unix calls into one. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 8 +-- dlls/bcrypt/bcrypt_main.c | 87 +++++++++++++++++++++------- dlls/bcrypt/gnutls.c | 132 +++++++++++++++++++----------------------- 3 files changed, 132 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c2408464cfea0d3e5b0…

1 0

Hans Leidekker : bcrypt: Store a public key handle instead of a blob.
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: b352d353b41654ad2b94d46747c5d203acc417f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b352d353b41654ad2b94d467… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 21 09:50:10 2022 +0100 bcrypt: Store a public key handle instead of a blob. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 2 - dlls/bcrypt/bcrypt_main.c | 68 ++---- dlls/bcrypt/gnutls.c | 481 ++++++++++-------------------------------- 3 files changed, 125 insertions(+), 426 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b352d353b41654ad2b94…

1 0

Eric Pouech : ntdll/tests: Enable compilation with long types in large_int.c
by Alexandre Julliard March 21, 2022

March 21, 2022

Module: wine Branch: master Commit: f7ea99419481adef8de8e41c59bc3022c00dc573 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7ea99419481adef8de8e41c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 19 10:14:46 2022 +0100 ntdll/tests: Enable compilation with long types in large_int.c Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/large_int.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/large_int.c b/dlls/ntdll/tests/large_int.c index 00316fe65e0..3ae18f7906a 100644 --- a/dlls/ntdll/tests/large_int.c +++ b/dlls/ntdll/tests/large_int.c @@ -20,6 +20,7 @@ * We use function pointers here as there is no import library for NTDLL on * windows. */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include <stdlib.h> @@ -297,7 +298,7 @@ static void one_RtlInt64ToUnicodeString_test(int test_num, const largeint2str_t #ifdef _WIN64 if (largeint2str->value >> 32 == 0xffffffff) /* this crashes on 64-bit Vista */ { - skip( "Value ffffffff%08x broken on 64-bit windows\n", (DWORD)largeint2str->value ); + skip( "Value ffffffff%08lx broken on 64-bit windows\n", (DWORD)largeint2str->value ); return; } #endif @@ -340,7 +341,7 @@ static void one_RtlInt64ToUnicodeString_test(int test_num, const largeint2str_t } /* if */ } else { ok(result == largeint2str->result, - "(test %d): RtlInt64ToUnicodeString(0x%s, %d, [out]) has result %x, expected: %x\n", + "(test %d): RtlInt64ToUnicodeString(0x%s, %d, [out]) has result %lx, expected: %lx\n", test_num, wine_dbgstr_longlong(largeint2str->value), largeint2str->base, result, largeint2str->result); if (result == STATUS_SUCCESS) { ok(unicode_string.Buffer[unicode_string.Length/sizeof(WCHAR)] == '\0', @@ -349,7 +350,7 @@ static void one_RtlInt64ToUnicodeString_test(int test_num, const largeint2str_t } /* if */ } /* if */ ok(memcmp(unicode_string.Buffer, expected_unicode_string.Buffer, LARGE_STRI_BUFFER_LENGTH * sizeof(WCHAR)) == 0, - "(test %d): RtlInt64ToUnicodeString(0x%x%08x, %d, [out]) assigns string \"%s\", expected: \"%s\"\n", + "(test %d): RtlInt64ToUnicodeString(0x%lx%08lx, %d, [out]) assigns string \"%s\", expected: \"%s\"\n", test_num, (DWORD)(largeint2str->value >>32), (DWORD)largeint2str->value, largeint2str->base, ansi_str.Buffer, expected_ansi_str.Buffer); ok(unicode_string.Length == expected_unicode_string.Length, @@ -384,7 +385,7 @@ static void one_RtlLargeIntegerToChar_test(int test_num, const largeint2str_t *l #ifdef _WIN64 if (largeint2str->value >> 32 == 0xffffffff) /* this crashes on 64-bit Vista */ { - skip( "Value ffffffff%08x broken on 64-bit windows\n", (DWORD)largeint2str->value ); + skip( "Value ffffffff%08lx broken on 64-bit windows\n", (DWORD)largeint2str->value ); return; } #endif @@ -398,7 +399,7 @@ static void one_RtlLargeIntegerToChar_test(int test_num, const largeint2str_t *l result = pRtlLargeIntegerToChar(&value, largeint2str->base, largeint2str->MaximumLength, dest_str); } /* if */ ok(result == largeint2str->result, - "(test %d): RtlLargeIntegerToChar(0x%s, %d, %d, [out]) has result %x, expected: %x\n", + "(test %d): RtlLargeIntegerToChar(0x%s, %d, %d, [out]) has result %lx, expected: %lx\n", test_num, wine_dbgstr_longlong(largeint2str->value), largeint2str->base, largeint2str->MaximumLength, result, largeint2str->result); ok(memcmp(dest_str, largeint2str->Buffer, LARGE_STRI_BUFFER_LENGTH) == 0, @@ -421,24 +422,24 @@ static void test_RtlLargeIntegerToChar(void) value = largeint2str[0].value; result = pRtlLargeIntegerToChar(&value, 20, largeint2str[0].MaximumLength, NULL); ok(result == STATUS_INVALID_PARAMETER, - "(test a): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %x, expected: %x\n", + "(test a): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %lx, expected: %lx\n", wine_dbgstr_longlong(largeint2str[0].value), 20, largeint2str[0].MaximumLength, result, STATUS_INVALID_PARAMETER); result = pRtlLargeIntegerToChar(&value, 20, 0, NULL); ok(result == STATUS_INVALID_PARAMETER, - "(test b): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %x, expected: %x\n", + "(test b): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %lx, expected: %lx\n", wine_dbgstr_longlong(largeint2str[0].value), 20, largeint2str[0].MaximumLength, result, STATUS_INVALID_PARAMETER); result = pRtlLargeIntegerToChar(&value, largeint2str[0].base, 0, NULL); ok(result == STATUS_BUFFER_OVERFLOW, - "(test c): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %x, expected: %x\n", + "(test c): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %lx, expected: %lx\n", wine_dbgstr_longlong(largeint2str[0].value), largeint2str[0].base, 0, result, STATUS_BUFFER_OVERFLOW); result = pRtlLargeIntegerToChar(&value, largeint2str[0].base, largeint2str[0].MaximumLength, NULL); ok(result == STATUS_ACCESS_VIOLATION, - "(test d): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %x, expected: %x\n", + "(test d): RtlLargeIntegerToChar(0x%s, %d, %d, NULL) has result %lx, expected: %lx\n", wine_dbgstr_longlong(largeint2str[0].value), largeint2str[0].base, largeint2str[0].MaximumLength, result, STATUS_ACCESS_VIOLATION); }

1 0