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

Jacek Caban : user32: Use CreateAcceleratorTableW in CreateAcceleratorTableA.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: wine Branch: master Commit: e58b561ced05410f638927540544fbe84b47906e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e58b561ced05410f63892754… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 2 15:06:17 2022 +0100 user32: Use CreateAcceleratorTableW in CreateAcceleratorTableA. Instead of accessing accelerators object directly. 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, 12 insertions(+), 13 deletions(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index ce64833e413..7c15e1905a5 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -152,10 +152,10 @@ INT WINAPI CopyAcceleratorTableW(HACCEL src, LPACCEL dst, INT count) /********************************************************************* * CreateAcceleratorTableA (USER32.@) */ -HACCEL WINAPI CreateAcceleratorTableA(LPACCEL lpaccel, INT count) +HACCEL WINAPI CreateAcceleratorTableA( ACCEL *accel, INT count ) { - struct accelerator *accel; HACCEL handle; + ACCEL *table; int i; if (count < 1) @@ -163,22 +163,21 @@ HACCEL WINAPI CreateAcceleratorTableA(LPACCEL lpaccel, INT count) SetLastError( ERROR_INVALID_PARAMETER ); return 0; } - accel = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct accelerator, table[count] )); - if (!accel) return 0; - accel->count = count; + table = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*table) ); + if (!table) return 0; for (i = 0; i < count; i++) { - accel->table[i].fVirt = lpaccel[i].fVirt; - accel->table[i].cmd = lpaccel[i].cmd; - if (!(lpaccel[i].fVirt & FVIRTKEY)) + table[i].fVirt = accel[i].fVirt; + table[i].cmd = accel[i].cmd; + if (!(accel[i].fVirt & FVIRTKEY)) { - char ch = lpaccel[i].key; - MultiByteToWideChar( CP_ACP, 0, &ch, 1, &accel->table[i].key, 1 ); + char ch = accel[i].key; + MultiByteToWideChar( CP_ACP, 0, &ch, 1, &table[i].key, 1 ); } - else accel->table[i].key = lpaccel[i].key; + else table[i].key = accel[i].key; } - if (!(handle = alloc_user_handle( &accel->obj, NTUSER_OBJ_ACCEL ))) - HeapFree( GetProcessHeap(), 0, accel ); + handle = CreateAcceleratorTableW( table, count ); + HeapFree( GetProcessHeap(), 0, table ); TRACE_(accel)("returning %p\n", handle ); return handle; }

1 0

Jacek Caban : user32: Use ACCEL struct in accelerator object.
by Alexandre Julliard March 2, 2022

March 2, 2022

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

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

March 2, 2022

Module: wine Branch: master Commit: b83e327ada65a1a24a991e9bef4c2154cc0e790c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b83e327ada65a1a24a991e9b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:04:52 2022 +0100 opengl32/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/opengl32/tests/Makefile.in | 1 - dlls/opengl32/tests/opengl.c | 184 ++++++++++++++++++++-------------------- 2 files changed, 92 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b83e327ada65a1a24a99…

1 0

Eric Pouech : ntdll/tests: Fix erroneous ok parameters.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: wine Branch: master Commit: 1297ccb3708584bcbc6925b1693eafa865760d62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1297ccb3708584bcbc6925b1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:04:59 2022 +0100 ntdll/tests: Fix erroneous ok parameters. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 6 +++--- dlls/ntdll/tests/wow64.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 549a05b0ece..a99b1e46b06 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -4095,7 +4095,7 @@ static void test_thread_context(void) expect.SegFs, expect.SegGs, expect.SegSs, expect.EFlags, expect.prev_frame ); trace( "actual: rax=%p rbx=%p rcx=%p rdx=%p rsi=%p rdi=%p " "r8=%p r9=%p r10=%p r11=%p r12=%p r13=%p r14=%p r15=%p " - "rbp=%p rsp=%p rip=%p cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x prev=%08x\n", + "rbp=%p rsp=%p rip=%p cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x\n", (void *)context.Rax, (void *)context.Rbx, (void *)context.Rcx, (void *)context.Rdx, (void *)context.Rsi, (void *)context.Rdi, (void *)context.R8, (void *)context.R9, (void *)context.R10, (void *)context.R11, (void *)context.R12, (void *)context.R13, @@ -4155,7 +4155,7 @@ static void test_thread_context(void) expect.SegFs, expect.SegGs, expect.SegSs, expect.EFlags, expect.prev_frame ); trace( "actual: rax=%p rbx=%p rcx=%p rdx=%p rsi=%p rdi=%p " "r8=%p r9=%p r10=%p r11=%p r12=%p r13=%p r14=%p r15=%p " - "rbp=%p rsp=%p rip=%p cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x prev=%08x\n", + "rbp=%p rsp=%p rip=%p cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x flags=%08x\n", (void *)context.Rax, (void *)context.Rbx, (void *)context.Rcx, (void *)context.Rdx, (void *)context.Rsi, (void *)context.Rdi, (void *)context.R8, (void *)context.R9, (void *)context.R10, (void *)context.R11, (void *)context.R12, (void *)context.R13, @@ -4293,7 +4293,7 @@ static void test_wow64_context(void) ok((WORD)ctx_ptr->FloatSave.ControlWord == ctx.FloatSave.ControlWord, "got control word %08x / %08x\n", ctx_ptr->FloatSave.ControlWord, ctx.FloatSave.ControlWord); ok(*(WORD *)ctx_ptr->ExtendedRegisters == *(WORD *)ctx.ExtendedRegisters, - "got SSE control word %04x\n", *(WORD *)ctx_ptr->ExtendedRegisters, + "got SSE control word %04x / %04x\n", *(WORD *)ctx_ptr->ExtendedRegisters, *(WORD *)ctx.ExtendedRegisters); ecx = ctx.Ecx; diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index f5d7b08cac3..1c8ca28a999 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -604,7 +604,7 @@ static void test_cpu_area(void) ok( info.ContextFlagsLocation == (char *)info.Context + tests[i].offset, "%u:%u: wrong flags offset %u\n", i, j, (ULONG)((char *)info.ContextFlagsLocation - (char *)info.Context) ); - ok( info.CpuReserved == cpu, "%u:%u: wrong cpu %p / %p\n", info.CpuReserved, cpu ); + ok( info.CpuReserved == cpu, "%u:%u: wrong cpu %p / %p\n", i, j, info.CpuReserved, cpu ); ok( info.ContextFlag == tests[i].flag, "%u:%u: wrong flag %08x\n", i, j, info.ContextFlag ); ok( info.Machine == tests[i].machine, "%u:%u: wrong machine %x\n", i, j, info.Machine ); }

1 0

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

March 2, 2022

Module: wine Branch: master Commit: e06b668f409d8f9c38611b978b019a04122e7b5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e06b668f409d8f9c38611b97… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:34:13 2022 +0100 mshtml/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/Makefile.in | 1 - dlls/mshtml/tests/activex.c | 216 ++--- dlls/mshtml/tests/dom.c | 1880 ++++++++++++++++++------------------ dlls/mshtml/tests/events.c | 450 ++++----- dlls/mshtml/tests/htmldoc.c | 852 ++++++++-------- dlls/mshtml/tests/htmllocation.c | 48 +- dlls/mshtml/tests/misc.c | 40 +- dlls/mshtml/tests/protocol.c | 304 +++--- dlls/mshtml/tests/script.c | 336 +++---- dlls/mshtml/tests/style.c | 1302 ++++++++++++------------- dlls/mshtml/tests/xmlhttprequest.c | 216 ++--- 11 files changed, 2822 insertions(+), 2823 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e06b668f409d8f9c3861…

1 0

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

March 2, 2022

Module: wine Branch: master Commit: 816395e87748f28badaa7ca9244893b8c6520a99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=816395e87748f28badaa7ca9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:33:49 2022 +0100 mscoree/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/Makefile.in | 1 - dlls/mscoree/tests/comtest.c | 44 +++++------ dlls/mscoree/tests/debugging.c | 26 +++---- dlls/mscoree/tests/metahost.c | 46 ++++++------ dlls/mscoree/tests/mscoree.c | 162 ++++++++++++++++++++--------------------- 5 files changed, 139 insertions(+), 140 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=816395e87748f28badaa…

1 0

Bernhard Kölbl : widl: Allow multiple uses of the activatable attribute.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: wine Branch: master Commit: 6555201716591f1824d309caee8ee10234c5a1f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6555201716591f1824d309ca… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 1 22:21:25 2022 +0100 widl: Allow multiple uses of the activatable attribute. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 93f7b0f52b9..02db99a55b7 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2326,7 +2326,7 @@ struct allowed_attr struct allowed_attr allowed_attr[] = { /* attr { D ACF M I Fn ARG T En Enm St Un Fi L DI M C AC R <display name> } */ - /* ATTR_ACTIVATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "activatable" }, + /* ATTR_ACTIVATABLE */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "activatable" }, /* ATTR_AGGREGATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "aggregatable" }, /* ATTR_ALLOCATE */ { 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "allocate" }, /* ATTR_ANNOTATION */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "annotation" },

1 0

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

March 2, 2022

Module: wine Branch: master Commit: 786a7e8b0c201c87abf3dae19bf8b9c9369604d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=786a7e8b0c201c87abf3dae1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Mar 2 09:04:40 2022 +0100 oledb32/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/oledb32/tests/Makefile.in | 1 - dlls/oledb32/tests/convert.c | 2408 ++++++++++++++++++++-------------------- dlls/oledb32/tests/database.c | 248 ++--- dlls/oledb32/tests/marshal.c | 22 +- 4 files changed, 1339 insertions(+), 1340 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=786a7e8b0c201c87abf3…

1 0

Zhiyi Zhang : wine.inf: Enable Light theme by default.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: wine Branch: master Commit: ccc2c6c613264aa228bd6b113dffebc7bcf2c1f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccc2c6c613264aa228bd6b11… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 2 14:21:48 2022 +0800 wine.inf: Enable Light theme by default. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0e488d87dcb..3e6194a3929 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -71,6 +71,7 @@ AddReg=\ Services, \ SessionMgr,\ Tapi,\ + ThemeManager,\ Timezones,\ LicenseInformation @@ -95,6 +96,7 @@ AddReg=\ Services, \ SessionMgr,\ Tapi,\ + ThemeManager,\ Timezones,\ VersionInfo,\ LicenseInformation @@ -121,6 +123,7 @@ AddReg=\ Services, \ SessionMgr,\ Tapi,\ + ThemeManager,\ Timezones,\ VersionInfo.ntamd64,\ LicenseInformation @@ -147,6 +150,7 @@ AddReg=\ Services, \ SessionMgr,\ Tapi,\ + ThemeManager,\ Timezones,\ VersionInfo.ntamd64,\ LicenseInformation @@ -5494,6 +5498,12 @@ ServiceType=32 StartType=3 ErrorControl=1 +[ThemeManager] +HKCU,"Software\Microsoft\Windows\CurrentVersion\ThemeManager","ThemeActive",2,"1" +HKCU,"Software\Microsoft\Windows\CurrentVersion\ThemeManager","DllName",2,"%10%\resources\themes\light\light.msstyles" +HKCU,"Software\Microsoft\Windows\CurrentVersion\ThemeManager","ColorName",2,"Blue" +HKCU,"Software\Microsoft\Windows\CurrentVersion\ThemeManager","SizeName",2,"NormalSize" + [WinmgmtService] Description="Provides access to Windows Management Instrumentation" DisplayName="Windows Management Instrumentation Service"

1 0

Santino Mazza : bcrypt/tests: Test for invalid RSA keyblob.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: wine Branch: master Commit: 94e5de6d169ba055a2e825c38ec69ca72a625f21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94e5de6d169ba055a2e825c3… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Tue Mar 1 19:34:05 2022 -0300 bcrypt/tests: Test for invalid RSA keyblob. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index e7619897cfd..1588b72c3fd 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1971,6 +1971,24 @@ static UCHAR rsaFullPrivateBlob[] = 0x9d, 0xe2, 0xcc, 0x5a, 0xf1, 0x68, 0x30, 0xe5, 0xbc, 0x8d, 0xad, }; + +static UCHAR rsaPublicBlobWithInvalidPublicExpSize[] = +{ + 0x52, 0x53, 0x41, 0x31, 0x00, 0x04, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x01, 0xc7, 0x8f, 0xac, 0x2a, 0xce, 0xbf, 0xc9, 0x6c, 0x7b, + 0x85, 0x74, 0x71, 0xbb, 0xff, 0xbb, 0x9b, 0x20, 0x03, 0x79, 0x17, 0x34, + 0xe7, 0x26, 0x91, 0x5c, 0x1f, 0x1b, 0x03, 0x3d, 0x46, 0xdf, 0xb6, 0xf2, + 0x10, 0x55, 0xf0, 0x39, 0x55, 0x0a, 0xe3, 0x9c, 0x0c, 0x63, 0xc2, 0x14, + 0x03, 0x94, 0x51, 0x0d, 0xb4, 0x22, 0x09, 0xf2, 0x5c, 0xb2, 0xd1, 0xc3, + 0xac, 0x6f, 0xa8, 0xc4, 0xac, 0xb8, 0xbc, 0x59, 0xe7, 0xed, 0x77, 0x6e, + 0xb1, 0x80, 0x58, 0x7d, 0xb2, 0x94, 0x46, 0xe5, 0x00, 0xe2, 0xb7, 0x33, + 0x48, 0x7a, 0xd3, 0x78, 0xe9, 0x26, 0x01, 0xc7, 0x00, 0x7b, 0x41, 0x6d, + 0x94, 0x3a, 0xe1, 0x50, 0x2b, 0x9f, 0x6b, 0x1c, 0x08, 0xa3, 0xfc, 0x0a, + 0x44, 0x81, 0x09, 0x41, 0x80, 0x23, 0x7b, 0xf6, 0x3f, 0xaf, 0x91, 0xa1, + 0x87, 0x75, 0x33, 0x15, 0xb8, 0xde, 0x32, 0x30, 0xb4, 0x5e, 0xfd +}; + static void test_RSA(void) { static UCHAR hash[] = @@ -2076,7 +2094,7 @@ static void test_RSA(void) ok(size == size2, "got %lu expected %lu\n", size2, size); HeapFree(GetProcessHeap(), 0, buf); - /* export public key */ + /* import/export public key */ size = 0; ret = BCryptExportKey(key, NULL, BCRYPT_RSAPUBLIC_BLOB, NULL, 0, &size, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); @@ -2096,6 +2114,12 @@ static void test_RSA(void) ret = BCryptDestroyKey(key); ok(!ret, "got %#lx\n", ret); + todo_wine + { + ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlobWithInvalidPublicExpSize, sizeof(rsaPublicBlobWithInvalidPublicExpSize), 0); + ok(ret == NTE_BAD_DATA, "got %#lx\n", ret); + } + ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, buf, size, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); HeapFree(GetProcessHeap(), 0, buf);

1 0