wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Matteo Bruni : d3d8: Fix d3d8_device_GetInfo() implementation.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 64bd13abb446507f9cbbc3f7676eb3fd0f8a98a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64bd13abb446507f9cbbc3f7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 20 23:37:31 2018 +0100 d3d8: Fix d3d8_device_GetInfo() implementation. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 6 ++++-- dlls/d3d8/tests/device.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 367f5c1..4fcad71 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2187,9 +2187,11 @@ static HRESULT WINAPI d3d8_device_ValidateDevice(IDirect3DDevice8 *iface, DWORD static HRESULT WINAPI d3d8_device_GetInfo(IDirect3DDevice8 *iface, DWORD info_id, void *info, DWORD info_size) { - FIXME("iface %p, info_id %#x, info %p, info_size %u stub!\n", iface, info_id, info, info_size); + TRACE("iface %p, info_id %#x, info %p, info_size %u.\n", iface, info_id, info, info_size); - return D3D_OK; + if (info_id < 4) + return E_FAIL; + return S_FALSE; } static HRESULT WINAPI d3d8_device_SetPaletteEntries(IDirect3DDevice8 *iface, diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 4d0ef71..8dbd464 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8701,6 +8701,47 @@ static void test_device_caps(void) DestroyWindow(window); } +static void test_get_info(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + BYTE info[1024]; + ULONG refcount; + unsigned int i; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + /* As called by Chessmaster 9000 (bug 42118). */ + hr = IDirect3DDevice8_GetInfo(device, 4, info, 16); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + for (i = 0; i < 256; ++i) + { + hr = IDirect3DDevice8_GetInfo(device, i, info, sizeof(info)); + if (i <= 4) + ok(hr == (i < 4 ? E_FAIL : S_FALSE), "info_id %u, unexpected hr %#x.\n", i, hr); + else + ok(hr == E_FAIL || hr == S_FALSE, "info_id %u, unexpected hr %#x.\n", i, hr); + } + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); @@ -8811,6 +8852,7 @@ START_TEST(device) test_clip_planes_limits(); test_swapchain_multisample_reset(); test_device_caps(); + test_get_info(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Alistair Leslie-Hughes : ntoskrnl.exe: Add ObRegisterCallbacks stub.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 6bc12302d960c8ab3f0c1f71ae3d8c984ebc7281 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bc12302d960c8ab3f0c1f71… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 21 05:40:18 2018 +0000 ntoskrnl.exe: Add ObRegisterCallbacks stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + 3 files changed, 14 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index deca120..6388658 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2306,6 +2306,18 @@ void WINAPI ObfDereferenceObject( void *obj ) ObDereferenceObject( obj ); } +/*********************************************************************** + * ObRegisterCallbacks (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION *callBack, void **handle) +{ + FIXME( "stub: %p %p\n", callBack, handle ); + + if(handle) + *handle = UlongToHandle(0xdeadbeaf); + + return STATUS_SUCCESS; +} /*********************************************************************** * IoGetAttachedDeviceReference (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2f54728..8c3057f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -817,6 +817,7 @@ @ stdcall ObReferenceObjectByName(ptr long ptr long ptr long ptr ptr) @ stdcall ObReferenceObjectByPointer(ptr long ptr long) @ stub ObReferenceSecurityDescriptor +@ stdcall ObRegisterCallbacks(ptr ptr) @ stub ObReleaseObjectSecurity @ stub ObSetHandleAttributes @ stub ObSetSecurityDescriptorInfo diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 127a8da..671e54a 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1429,6 +1429,7 @@ static inline void *MmGetSystemAddressForMdlSafe(MDL *mdl, ULONG priority) } void WINAPI ObDereferenceObject(void*); +NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION*, void**); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**); NTSTATUS WINAPI ObReferenceObjectByPointer(void*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE);

1 0

Alistair Leslie-Hughes : include: Add more types to ntifs.h.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 210bb7ddb4e0888a43e66d41b18cba2165fcc3aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=210bb7ddb4e0888a43e66d41… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 21 05:40:17 2018 +0000 include: Add more types to ntifs.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/ntifs.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 32c9e30..8c63d0b 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -19,8 +19,24 @@ #ifndef __NTIFS_H__ #define __NTIFS_H__ +#include "ntddk.h" + typedef struct _EX_PUSH_LOCK EX_PUSH_LOCK, *PEX_PUSH_LOCK; +typedef enum _FS_FILTER_SECTION_SYNC_TYPE +{ + SyncTypeOther = 0, + SyncTypeCreateSection +} FS_FILTER_SECTION_SYNC_TYPE, *PFS_FILTER_SECTION_SYNC_TYPE; + +typedef struct _FS_FILTER_SECTION_SYNC_OUTPUT +{ + ULONG StructureSize; + ULONG SizeReturned; + ULONG Flags; + ULONG DesiredReadAlignment; +} FS_FILTER_SECTION_SYNC_OUTPUT, *PFS_FILTER_SECTION_SYNC_OUTPUT; + typedef struct _KQUEUE { DISPATCHER_HEADER Header; @@ -30,6 +46,7 @@ typedef struct _KQUEUE LIST_ENTRY ThreadListHead; } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; + NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); #endif

1 0

Alistair Leslie-Hughes : include: Add more typedefs to wdm.h.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 4e6900890d4387d9844de28a1bbaa234b6ab8c76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e6900890d4387d9844de28a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 21 05:40:15 2018 +0000 include: Add more typedefs to wdm.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 834f208..127a8da 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -44,6 +44,7 @@ typedef ULONG_PTR KSPIN_LOCK, *PKSPIN_LOCK; typedef ULONG_PTR ERESOURCE_THREAD; typedef ERESOURCE_THREAD *PERESOURCE_THREAD; +typedef struct _FILE_GET_QUOTA_INFORMATION *PFILE_GET_QUOTA_INFORMATION; struct _KDPC; struct _KAPC; @@ -1223,6 +1224,99 @@ typedef struct _KLOCK_QUEUE_HANDLE { typedef NTSTATUS (NTAPI EX_CALLBACK_FUNCTION)(void *CallbackContext, void *Argument1, void *Argument2); typedef EX_CALLBACK_FUNCTION *PEX_CALLBACK_FUNCTION; +typedef ULONG OB_OPERATION; + +typedef struct _OB_PRE_CREATE_HANDLE_INFORMATION { + ACCESS_MASK DesiredAccess; + ACCESS_MASK OriginalDesiredAccess; +} OB_PRE_CREATE_HANDLE_INFORMATION, *POB_PRE_CREATE_HANDLE_INFORMATION; + +typedef struct _OB_PRE_DUPLICATE_HANDLE_INFORMATION { + ACCESS_MASK DesiredAccess; + ACCESS_MASK OriginalDesiredAccess; + PVOID SourceProcess; + PVOID TargetProcess; +} OB_PRE_DUPLICATE_HANDLE_INFORMATION, *POB_PRE_DUPLICATE_HANDLE_INFORMATION; + +typedef union _OB_PRE_OPERATION_PARAMETERS { + OB_PRE_CREATE_HANDLE_INFORMATION CreateHandleInformation; + OB_PRE_DUPLICATE_HANDLE_INFORMATION DuplicateHandleInformation; +} OB_PRE_OPERATION_PARAMETERS, *POB_PRE_OPERATION_PARAMETERS; + +typedef struct _OB_PRE_OPERATION_INFORMATION { + OB_OPERATION Operation; + union { + ULONG Flags; + struct { + ULONG KernelHandle:1; + ULONG Reserved:31; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + PVOID Object; + POBJECT_TYPE ObjectType; + PVOID CallContext; + POB_PRE_OPERATION_PARAMETERS Parameters; +} OB_PRE_OPERATION_INFORMATION, *POB_PRE_OPERATION_INFORMATION; + +typedef struct _OB_POST_CREATE_HANDLE_INFORMATION { + ACCESS_MASK GrantedAccess; +} OB_POST_CREATE_HANDLE_INFORMATION, *POB_POST_CREATE_HANDLE_INFORMATION; + +typedef struct _OB_POST_DUPLICATE_HANDLE_INFORMATION { + ACCESS_MASK GrantedAccess; +} OB_POST_DUPLICATE_HANDLE_INFORMATION, *POB_POST_DUPLICATE_HANDLE_INFORMATION; + +typedef union _OB_POST_OPERATION_PARAMETERS { + OB_POST_CREATE_HANDLE_INFORMATION CreateHandleInformation; + OB_POST_DUPLICATE_HANDLE_INFORMATION DuplicateHandleInformation; +} OB_POST_OPERATION_PARAMETERS, *POB_POST_OPERATION_PARAMETERS; + +typedef struct _OB_POST_OPERATION_INFORMATION { + OB_OPERATION Operation; + union { + ULONG Flags; + struct { + ULONG KernelHandle:1; + ULONG Reserved:31; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + PVOID Object; + POBJECT_TYPE ObjectType; + PVOID CallContext; + NTSTATUS ReturnStatus; + POB_POST_OPERATION_PARAMETERS Parameters; +} OB_POST_OPERATION_INFORMATION,*POB_POST_OPERATION_INFORMATION; + +typedef enum _OB_PREOP_CALLBACK_STATUS { + OB_PREOP_SUCCESS +} OB_PREOP_CALLBACK_STATUS, *POB_PREOP_CALLBACK_STATUS; + +typedef OB_PREOP_CALLBACK_STATUS (WINAPI *POB_PRE_OPERATION_CALLBACK)(void *context, POB_PRE_OPERATION_INFORMATION information); +typedef void (WINAPI *POB_POST_OPERATION_CALLBACK)(void *context, POB_POST_OPERATION_INFORMATION information); + +typedef struct _OB_OPERATION_REGISTRATION { + POBJECT_TYPE *ObjectType; + OB_OPERATION Operations; + POB_PRE_OPERATION_CALLBACK PreOperation; + POB_POST_OPERATION_CALLBACK PostOperation; +} OB_OPERATION_REGISTRATION, *POB_OPERATION_REGISTRATION; + +typedef struct _OB_CALLBACK_REGISTRATION { + USHORT Version; + USHORT OperationRegistrationCount; + UNICODE_STRING Altitude; + PVOID RegistrationContext; + OB_OPERATION_REGISTRATION *OperationRegistration; +} OB_CALLBACK_REGISTRATION, *POB_CALLBACK_REGISTRATION; + +#define OB_FLT_REGISTRATION_VERSION_0100 0x0100 +#define OB_FLT_REGISTRATION_VERSION OB_FLT_REGISTRATION_VERSION_0100 + +typedef enum _DIRECTORY_NOTIFY_INFORMATION_CLASS { + DirectoryNotifyInformation = 1, + DirectoryNotifyExtendedInformation +} DIRECTORY_NOTIFY_INFORMATION_CLASS, *PDIRECTORY_NOTIFY_INFORMATION_CLASS; + NTSTATUS WINAPI ObCloseHandle(IN HANDLE handle); #ifdef NONAMELESSUNION

1 0

Louis Lenders : sas: Add stub dll.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: be0bae2c6b4294be6e3fb9a3b7bf2ed59081f0b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be0bae2c6b4294be6e3fb9a3… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Mar 9 16:15:41 2018 +0100 sas: Add stub dll. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/sas/Makefile.in | 4 ++++ dlls/sas/main.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/sas/sas.spec | 1 + 5 files changed, 49 insertions(+) diff --git a/configure b/configure index 88ee44d..6324574 100755 --- a/configure +++ b/configure @@ -1482,6 +1482,7 @@ enable_rtutils enable_samlib enable_sane_ds enable_sapi +enable_sas enable_scarddlg enable_sccbase enable_schannel @@ -18958,6 +18959,7 @@ wine_fn_config_makefile dlls/samlib enable_samlib wine_fn_config_makefile dlls/sane.ds enable_sane_ds wine_fn_config_makefile dlls/sapi enable_sapi wine_fn_config_makefile dlls/sapi/tests enable_tests +wine_fn_config_makefile dlls/sas enable_sas wine_fn_config_makefile dlls/scarddlg enable_scarddlg wine_fn_config_makefile dlls/sccbase enable_sccbase wine_fn_config_makefile dlls/schannel enable_schannel diff --git a/configure.ac b/configure.ac index b6c94a5..6a30601 100644 --- a/configure.ac +++ b/configure.ac @@ -3583,6 +3583,7 @@ WINE_CONFIG_MAKEFILE(dlls/samlib) WINE_CONFIG_MAKEFILE(dlls/sane.ds) WINE_CONFIG_MAKEFILE(dlls/sapi) WINE_CONFIG_MAKEFILE(dlls/sapi/tests) +WINE_CONFIG_MAKEFILE(dlls/sas) WINE_CONFIG_MAKEFILE(dlls/scarddlg) WINE_CONFIG_MAKEFILE(dlls/sccbase) WINE_CONFIG_MAKEFILE(dlls/schannel) diff --git a/dlls/sas/Makefile.in b/dlls/sas/Makefile.in new file mode 100644 index 0000000..aa76b59 --- /dev/null +++ b/dlls/sas/Makefile.in @@ -0,0 +1,4 @@ +MODULE = sas.dll + +C_SRCS = \ + main.c diff --git a/dlls/sas/main.c b/dlls/sas/main.c new file mode 100644 index 0000000..1a2017d --- /dev/null +++ b/dlls/sas/main.c @@ -0,0 +1,41 @@ +/* + * Copyright 2018 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sas); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) +{ + TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + return TRUE; +} diff --git a/dlls/sas/sas.spec b/dlls/sas/sas.spec new file mode 100644 index 0000000..9af3cd3 --- /dev/null +++ b/dlls/sas/sas.spec @@ -0,0 +1 @@ +@ stub SendSAS

1 0

Nikolay Sivov : user32: Remove some misleading TODOs.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 080cb3aa81bd678ad8e214ded3fc6e81ecbc714c URL: https://source.winehq.org/git/wine.git/?a=commit;h=080cb3aa81bd678ad8e214de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 21 14:33:49 2018 +0300 user32: Remove some misleading TODOs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 16 ---------------- dlls/user32/combo.c | 2 -- dlls/user32/edit.c | 5 ----- 3 files changed, 23 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 0f56e4e..adfb6a9 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -28,30 +28,14 @@ * - WM_SETFOCUS: For (manual or automatic) radio buttons, send the parent window BN_CLICKED * - WM_NCCREATE: Turns any BS_OWNERDRAW button into a BS_PUSHBUTTON button. * - WM_SYSKEYUP - * - BCM_GETIDEALSIZE - * - BCM_GETIMAGELIST - * - BCM_GETTEXTMARGIN - * - BCM_SETIMAGELIST - * - BCM_SETTEXTMARGIN * * Notifications - * - BCN_HOTITEMCHANGE * - BN_DISABLE * - BN_PUSHED/BN_HILITE * + BN_KILLFOCUS: is it OK? * - BN_PAINT * + BN_SETFOCUS: is it OK? * - BN_UNPUSHED/BN_UNHILITE - * - NM_CUSTOMDRAW - * - * Structures/Macros/Definitions - * - BUTTON_IMAGELIST - * - NMBCHOTITEM - * - Button_GetIdealSize - * - Button_GetImageList - * - Button_GetTextMargin - * - Button_SetImageList - * - Button_SetTextMargin */ #include <stdarg.h> diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index ef75c76..dcfa661 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: - * - ComboBox_[GS]etMinVisible() - * - CB_GETMINVISIBLE, CB_SETMINVISIBLE * - CB_SETTOPINDEX */ diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 693c58f..96ecbec 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -21,11 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: - * - EDITBALLOONTIP structure - * - EM_GETCUEBANNER/Edit_GetCueBannerText - * - EM_HIDEBALLOONTIP/Edit_HideBalloonTip - * - EM_SETCUEBANNER/Edit_SetCueBannerText - * - EM_SHOWBALLOONTIP/Edit_ShowBalloonTip * - EM_GETIMESTATUS, EM_SETIMESTATUS * - EN_ALIGN_LTR_EC * - EN_ALIGN_RTL_EC

1 0

Michael Müller : bcrypt: Allow to call BCryptSetProperty on key objects.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 1b999a447b73d1441bb271cb11a47393d02024e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b999a447b73d1441bb271cb… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Mar 20 20:27:13 2018 +0000 bcrypt: Allow to call BCryptSetProperty on key objects. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 89 ++++++++++++++++++++++++++++++++-------------- dlls/bcrypt/tests/bcrypt.c | 4 +++ 2 files changed, 67 insertions(+), 26 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index a08eb00..cd44bdf 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -679,32 +679,6 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu } } -NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) -{ - struct object *object = handle; - - TRACE( "%p, %s, %p, %u, %08x\n", handle, debugstr_w(prop), value, size, flags ); - - if (!object) return STATUS_INVALID_HANDLE; - - switch (object->magic) - { - case MAGIC_ALG: - { - struct algorithm *alg = (struct algorithm *)object; - return set_alg_property( alg, prop, value, size, flags ); - } - case MAGIC_KEY: - { - FIXME( "keys not implemented yet\n" ); - return STATUS_NOT_IMPLEMENTED; - } - default: - WARN( "unknown magic %08x\n", object->magic ); - return STATUS_INVALID_HANDLE; - } -} - NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDLE *handle, UCHAR *object, ULONG objectlen, UCHAR *secret, ULONG secretlen, ULONG flags ) { @@ -954,6 +928,31 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s return STATUS_SUCCESS; } +static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) + { + if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) + { + key->mode = MODE_ID_CBC; + return STATUS_SUCCESS; + } + else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM, size )) + { + key->mode = MODE_ID_GCM; + return STATUS_SUCCESS; + } + else + { + FIXME( "unsupported mode %s\n", debugstr_wn( (WCHAR *)value, size ) ); + return STATUS_NOT_IMPLEMENTED; + } + } + + FIXME( "unsupported key property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; +} + static gnutls_cipher_algorithm_t get_gnutls_cipher( const struct key *key ) { switch (key->alg_id) @@ -1089,6 +1088,12 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s return STATUS_SUCCESS; } +static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { CCCryptorStatus status; @@ -1171,6 +1176,12 @@ static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *s return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) { ERR( "support for keys not available at build time\n" ); @@ -1478,6 +1489,32 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp return status; } +NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + struct object *object = handle; + + TRACE( "%p, %s, %p, %u, %08x\n", handle, debugstr_w(prop), value, size, flags ); + + if (!object) return STATUS_INVALID_HANDLE; + + switch (object->magic) + { + case MAGIC_ALG: + { + struct algorithm *alg = (struct algorithm *)object; + return set_alg_property( alg, prop, value, size, flags ); + } + case MAGIC_KEY: + { + struct key *key = (struct key *)object; + return set_key_property( key, prop, value, size, flags ); + } + default: + WARN( "unknown magic %08x\n", object->magic ); + return STATUS_INVALID_HANDLE; + } +} + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { switch (reason) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 1176796..9922e41 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -525,6 +525,10 @@ static void test_BCryptGenerateSymmetricKey(void) sizeof(BCRYPT_CHAIN_MODE_CBC), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ret = pBCryptSetProperty(key, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_CBC, + sizeof(BCRYPT_CHAIN_MODE_CBC), 0); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_NOT_SUPPORTED) /* < Win 8 */, "got %08x\n", ret); + size = 0xdeadbeef; ret = pBCryptEncrypt(key, NULL, 0, NULL, NULL, 0, NULL, 0, &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret);

1 0

Michael Müller : include: Add ecdsa and asymmetric key related bcrypt definitions.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 1f782675302020ddf58dc7e4c3051efc9b9b5b5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f782675302020ddf58dc7e4… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Mar 20 20:27:11 2018 +0000 include: Add ecdsa and asymmetric key related bcrypt definitions. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/bcrypt.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/bcrypt.h b/include/bcrypt.h index d0b29c7..717d77c 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -61,6 +61,8 @@ typedef LONG NTSTATUS; #define BCRYPT_OPAQUE_KEY_BLOB (const WCHAR []){'O','p','a','q','u','e','K','e','y','B','l','o','b',0} #define BCRYPT_KEY_DATA_BLOB (const WCHAR []){'K','e','y','D','a','t','a','B','l','o','b',0} #define BCRYPT_AES_WRAP_KEY_BLOB (const WCHAR []){'R','f','c','3','5','6','5','K','e','y','W','r','a','p','B','l','o','b',0} +#define BCRYPT_ECCPUBLIC_BLOB (const WCHAR []){'E','C','C','P','U','B','L','I','C','B','L','O','B',0} +#define BCRYPT_ECCPRIVATE_BLOB (const WCHAR []){'E','C','C','P','R','I','V','A','T','E','B','L','O','B',0} #define MS_PRIMITIVE_PROVIDER (const WCHAR [])\ {'M','i','c','r','o','s','o','f','t',' ','P','r','i','m','i','t','i','v','e',' ','P','r','o','v','i','d','e','r',0} @@ -76,6 +78,9 @@ typedef LONG NTSTATUS; #define BCRYPT_SHA256_ALGORITHM (const WCHAR []){'S','H','A','2','5','6',0} #define BCRYPT_SHA384_ALGORITHM (const WCHAR []){'S','H','A','3','8','4',0} #define BCRYPT_SHA512_ALGORITHM (const WCHAR []){'S','H','A','5','1','2',0} +#define BCRYPT_ECDSA_P256_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','2','5','6',0} +#define BCRYPT_ECDSA_P384_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','3','8','4',0} +#define BCRYPT_ECDSA_P521_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','5','2','1',0} #define BCRYPT_CHAIN_MODE_NA (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','N','/','A',0} #define BCRYPT_CHAIN_MODE_CBC (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','C','B','C',0} @@ -84,6 +89,13 @@ typedef LONG NTSTATUS; #define BCRYPT_CHAIN_MODE_CCM (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','C','C','M',0} #define BCRYPT_CHAIN_MODE_GCM (const WCHAR []){'C','h','a','i','n','i','n','g','M','o','d','e','G','C','M',0} +#define BCRYPT_ECDSA_PUBLIC_P256_MAGIC 0x31534345 +#define BCRYPT_ECDSA_PRIVATE_P256_MAGIC 0x32534345 +#define BCRYPT_ECDSA_PUBLIC_P384_MAGIC 0x33534345 +#define BCRYPT_ECDSA_PRIVATE_P384_MAGIC 0x34534345 +#define BCRYPT_ECDSA_PUBLIC_P521_MAGIC 0x35534345 +#define BCRYPT_ECDSA_PRIVATE_P521_MAGIC 0x36534345 + typedef struct _BCRYPT_ALGORITHM_IDENTIFIER { LPWSTR pszName; @@ -115,6 +127,23 @@ typedef struct _BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO ULONG dwFlags; } BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO, *PBCRYPT_AUTHENTICATED_CIPHER_MODE_INFO; +typedef struct _BCRYPT_ECCKEY_BLOB +{ + ULONG dwMagic; + ULONG cbKey; +} BCRYPT_ECCKEY_BLOB, *PBCRYPT_ECCKEY_BLOB; + +typedef struct _BCRYPT_PKCS1_PADDING_INFO +{ + LPCWSTR pszAlgId; +} BCRYPT_PKCS1_PADDING_INFO; + +#define BCRYPT_PAD_NONE 0x00000001 +#define BCRYPT_PAD_PKCS1 0x00000002 +#define BCRYPT_PAD_OAEP 0x00000004 +#define BCRYPT_PAD_PSS 0x00000008 +#define BCRYPT_PAD_PKCS1_OPTIONAL_HASH_OID 0x00000010 + #define BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO_VERSION 1 #define BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG 0x00000001

1 0

Michael Müller : bcrypt: Add support for computing/ comparing cipher tag.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: c7b46e8e3c1f91ba4e49ba7ae011006775d8b080 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7b46e8e3c1f91ba4e49ba7a… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Mar 20 20:27:09 2018 +0000 bcrypt: Add support for computing/comparing cipher tag. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 47 +++++++++++++++++++++++++++++++++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 10 +++++----- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 573cd37..a08eb00 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -50,6 +50,9 @@ static HINSTANCE instance; #if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) WINE_DECLARE_DEBUG_CHANNEL(winediag); +/* Not present in gnutls version < 3.0 */ +static int (*pgnutls_cipher_tag)(gnutls_cipher_hd_t handle, void * tag, size_t tag_size); + static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gnutls_cipher_decrypt2); @@ -69,6 +72,11 @@ MAKE_FUNCPTR(gnutls_perror); #define GNUTLS_CIPHER_AES_256_GCM 94 #endif +static int compat_gnutls_cipher_tag(gnutls_cipher_hd_t handle, void * tag, size_t tag_size) +{ + return GNUTLS_E_UNKNOWN_CIPHER_TYPE; +} + static void gnutls_log( int level, const char *msg ) { TRACE( "<%d> %s", level, msg ); @@ -102,6 +110,12 @@ static BOOL gnutls_initialize(void) LOAD_FUNCPTR(gnutls_perror) #undef LOAD_FUNCPTR + if (!(pgnutls_cipher_tag = wine_dlsym( libgnutls_handle, "gnutls_cipher_tag", NULL, 0 ))) + { + WARN("gnutls_cipher_tag not found\n"); + pgnutls_cipher_tag = compat_gnutls_cipher_tag; + } + if ((ret = pgnutls_global_init()) != GNUTLS_E_SUCCESS) { pgnutls_perror( ret ); @@ -1018,6 +1032,19 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le return STATUS_SUCCESS; } +static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) +{ + int ret; + + if ((ret = pgnutls_cipher_tag( key->handle, tag, len ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + static NTSTATUS key_destroy( struct key *key ) { if (key->handle) pgnutls_cipher_deinit( key->handle ); @@ -1123,6 +1150,12 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le return STATUS_SUCCESS; } +static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_destroy( struct key *key ) { if (key->ref_encrypt) CCCryptorRelease( key->ref_encrypt ); @@ -1158,6 +1191,12 @@ static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_le return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS key_get_tag( struct key *key, UCHAR *tag, ULONG len ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS key_destroy( struct key *key ) { ERR( "support for keys not available at build time\n" ); @@ -1311,7 +1350,7 @@ NTSTATUS WINAPI BCryptEncrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if ((status = key_encrypt( key, input, input_len, output, output_len ))) return status; - return STATUS_SUCCESS; + return key_get_tag( key, auth_info->pbTag, auth_info->cbTag ); } if ((status = key_set_params( key, iv, iv_len ))) return status; @@ -1370,6 +1409,7 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if (key->mode == MODE_ID_GCM) { BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; + UCHAR tag[16]; if (!auth_info) return STATUS_INVALID_PARAMETER; if (!auth_info->pbNonce) return STATUS_INVALID_PARAMETER; @@ -1387,6 +1427,11 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp if ((status = key_decrypt( key, input, input_len, output, output_len ))) return status; + if ((status = key_get_tag( key, tag, sizeof(tag) ))) + return status; + if (memcmp( tag, auth_info->pbTag, auth_info->cbTag )) + return STATUS_AUTH_TAG_MISMATCH; + return STATUS_SUCCESS; } diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index e3cbc87..1176796 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -754,11 +754,11 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(size == 32, "got %u\n", size); ok(!memcmp(ciphertext, expected4, sizeof(expected4)), "wrong data\n"); - todo_wine ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n"); + ok(!memcmp(tag, expected_tag, sizeof(expected_tag)), "wrong tag\n"); for (i = 0; i < 32; i++) ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) - todo_wine ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); + ok(tag[i] == expected_tag[i], "%u: %02x != %02x\n", i, tag[i], expected_tag[i]); /* input size is not multiple of block size */ size = 0; @@ -769,11 +769,11 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(size == 24, "got %u\n", size); ok(!memcmp(ciphertext, expected4, 24), "wrong data\n"); - todo_wine ok(!memcmp(tag, expected_tag2, sizeof(expected_tag2)), "wrong tag\n"); + ok(!memcmp(tag, expected_tag2, sizeof(expected_tag2)), "wrong tag\n"); for (i = 0; i < 24; i++) ok(ciphertext[i] == expected4[i], "%u: %02x != %02x\n", i, ciphertext[i], expected4[i]); for (i = 0; i < 16; i++) - todo_wine ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]); + ok(tag[i] == expected_tag2[i], "%u: %02x != %02x\n", i, tag[i], expected_tag2[i]); /* test with padding */ memcpy(ivbuf, iv, sizeof(iv)); @@ -977,7 +977,7 @@ static void test_BCryptDecrypt(void) memcpy(ivbuf, iv, sizeof(iv)); auth_info.pbTag = iv; /* wrong tag */ ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); - todo_wine ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %08x\n", ret); + ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %08x\n", ret); ok(size == 32, "got %u\n", size); ret = pBCryptDestroyKey(key);

1 0

Michael Müller : bcrypt: Implement BCryptDecrypt for AES GCM mode.
by Alexandre Julliard 21 Mar '18

21 Mar '18

Module: wine Branch: master Commit: 8d2b1d276df5727499a5a9f7a3dd12e0634032c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d2b1d276df5727499a5a9f7… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Mar 20 20:27:08 2018 +0000 bcrypt: Implement BCryptDecrypt for AES GCM mode. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 28 +++++++++++++++++++++++----- dlls/bcrypt/tests/bcrypt.c | 8 ++++---- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 9669553..573cd37 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1361,17 +1361,35 @@ NTSTATUS WINAPI BCryptDecrypt( BCRYPT_KEY_HANDLE handle, UCHAR *input, ULONG inp padding, iv, iv_len, output, output_len, ret_len, flags ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; - if (padding) - { - FIXME( "padding info not implemented\n" ); - return STATUS_NOT_IMPLEMENTED; - } if (flags & ~BCRYPT_BLOCK_PADDING) { FIXME( "flags %08x not supported\n", flags ); return STATUS_NOT_IMPLEMENTED; } + if (key->mode == MODE_ID_GCM) + { + BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO *auth_info = padding; + + if (!auth_info) return STATUS_INVALID_PARAMETER; + if (!auth_info->pbNonce) return STATUS_INVALID_PARAMETER; + if (!auth_info->pbTag) return STATUS_INVALID_PARAMETER; + if (auth_info->cbTag < 12 || auth_info->cbTag > 16) return STATUS_INVALID_PARAMETER; + + if ((status = key_set_params( key, auth_info->pbNonce, auth_info->cbNonce ))) + return status; + + *ret_len = input_len; + if (flags & BCRYPT_BLOCK_PADDING) return STATUS_INVALID_PARAMETER; + if (!output) return STATUS_SUCCESS; + if (output_len < *ret_len) return STATUS_BUFFER_TOO_SMALL; + + if ((status = key_decrypt( key, input, input_len, output, output_len ))) + return status; + + return STATUS_SUCCESS; + } + if ((status = key_set_params( key, iv, iv_len ))) return status; *ret_len = input_len; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 1875fb3..e3cbc87 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -969,16 +969,16 @@ static void test_BCryptDecrypt(void) memcpy(ivbuf, iv, sizeof(iv)); memset(plaintext, 0, sizeof(plaintext)); ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); - todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - todo_wine ok(size == 32, "got %u\n", size); - todo_wine ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == 32, "got %u\n", size); + ok(!memcmp(plaintext, expected3, sizeof(expected3)), "wrong data\n"); /* test with wrong tag */ memcpy(ivbuf, iv, sizeof(iv)); auth_info.pbTag = iv; /* wrong tag */ ret = pBCryptDecrypt(key, ciphertext4, 32, &auth_info, ivbuf, 16, plaintext, 32, &size, 0); todo_wine ok(ret == STATUS_AUTH_TAG_MISMATCH, "got %08x\n", ret); - todo_wine ok(size == 32, "got %u\n", size); + ok(size == 32, "got %u\n", size); ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret);

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2018