wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Piotr Caban : ucrtbase: Add __current_exception() implementation.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: ae5d0b22291d866a49f293e782b43ba025ab77ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae5d0b22291d866a49f293e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 19 17:43:57 2018 +0100 ucrtbase: Add __current_exception() implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcrt/except.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index cb6fd4e..0edd871 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -33,7 +33,7 @@ @ cdecl __RTDynamicCast(ptr long ptr ptr long) ucrtbase.__RTDynamicCast @ cdecl __RTtypeid(ptr) ucrtbase.__RTtypeid @ stub __TypeMatch -@ stub __current_exception +@ cdecl __current_exception() ucrtbase.__current_exception @ stub __current_exception_context @ stub __dcrt_get_wide_environment_from_os @ stub __dcrt_initial_narrow_environment diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 13698f8..3378283 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -508,4 +508,13 @@ void CDECL MSVCRT___std_exception_destroy(struct __std_exception_data *data) data->dofree = 0; } +/********************************************************************* + * __current_exception (UCRTBASE.@) + */ +void** CDECL __current_exception(void) +{ + TRACE("()\n"); + return (void**)&msvcrt_get_thread_data()->exc_record; +} + #endif /* _MSVCR_VER>=140 */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 5d12b4c..00d779c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -82,7 +82,7 @@ @ stub __conio_common_vcwprintf_s @ stub __conio_common_vcwscanf @ cdecl -arch=i386 __control87_2(long long ptr ptr) -@ stub __current_exception +@ cdecl __current_exception() @ stub __current_exception_context @ cdecl __daylight() MSVCRT___p__daylight @ stub __dcrt_get_wide_environment_from_os diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index c4f9f6a..331a087 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -30,7 +30,7 @@ @ cdecl __RTDynamicCast(ptr long ptr ptr long) ucrtbase.__RTDynamicCast @ cdecl __RTtypeid(ptr) ucrtbase.__RTtypeid @ stub __TypeMatch -@ stub __current_exception +@ cdecl __current_exception() ucrtbase.__current_exception @ stub __current_exception_context @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp @ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex

1 0

Henri Verbeet : usp10: Use usp10_array_reserve() in GSUB_initialize_language_cache().
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: cc131ec07ec0c7746d1d73a07b037169559b5618 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc131ec07ec0c7746d1d73a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 19 00:27:11 2018 +0330 usp10: Use usp10_array_reserve() in GSUB_initialize_language_cache(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 616835e..49a88a6 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2690,33 +2690,38 @@ static LoadedLanguage *usp10_script_get_language(LoadedScript *script, OPENTYPE_ static void GSUB_initialize_language_cache(LoadedScript *script) { - int i; + const OT_Script *table; + DWORD offset; + SIZE_T i; - if (script->table[USP10_SCRIPT_TABLE_GSUB]) + if (!(table = script->table[USP10_SCRIPT_TABLE_GSUB])) + return; + + if ((offset = GET_BE_WORD(table->DefaultLangSys))) { - DWORD offset; - const OT_Script *table = script->table[USP10_SCRIPT_TABLE_GSUB]; - script->language_count = GET_BE_WORD(table->LangSysCount); - offset = GET_BE_WORD(table->DefaultLangSys); - if (offset) - { - script->default_language.tag = MS_MAKE_TAG('d','f','l','t'); - script->default_language.gsub_table = (const BYTE*)table + offset; - } + script->default_language.tag = MS_MAKE_TAG('d','f','l','t'); + script->default_language.gsub_table = (const BYTE *)table + offset; + } - if (script->language_count) - { - TRACE("Deflang %p, LangCount %li\n",script->default_language.gsub_table, script->language_count); + if (!(script->language_count = GET_BE_WORD(table->LangSysCount))) + return; - script->languages = heap_alloc_zero(script->language_count * sizeof(*script->languages)); + TRACE("Deflang %p, LangCount %lu.\n", script->default_language.gsub_table, script->language_count); - for (i = 0; i < script->language_count; i++) - { - int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); - script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); - script->languages[i].gsub_table = ((const BYTE*)table + offset); - } - } + if (!usp10_array_reserve((void **)&script->languages, &script->languages_size, + script->language_count, sizeof(*script->languages))) + { + ERR("Failed to grow languages array.\n"); + return; + } + + for (i = 0; i < script->language_count; ++i) + { + script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], + table->LangSysRecord[i].LangSysTag[1], + table->LangSysRecord[i].LangSysTag[2], + table->LangSysRecord[i].LangSysTag[3]); + script->languages[i].gsub_table = (const BYTE *)table + GET_BE_WORD(table->LangSysRecord[i].LangSys); } }

1 0

Henri Verbeet : usp10: Merge GSUB_initialize_script_cache() and GPOS_expand_script_cache().
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: 66decba0e9fe4d21a8e6e3dba79cad78a5ed8608 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66decba0e9fe4d21a8e6e3db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 16 13:56:29 2018 +0330 usp10: Merge GSUB_initialize_script_cache() and GPOS_expand_script_cache(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 78 ++++++++++++++++----------------------------- dlls/usp10/usp10_internal.h | 10 ++++-- 2 files changed, 35 insertions(+), 53 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 521b816..616835e 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2595,54 +2595,21 @@ static LoadedScript *usp10_script_cache_get_script(ScriptCache *script_cache, OP return NULL; } -static void GSUB_initialize_script_cache(ScriptCache *psc) -{ - const OT_ScriptList *script; - const GSUB_Header *header; - SIZE_T i; - - if (!(header = psc->GSUB_Table)) - return; - - script = (const OT_ScriptList *)((const BYTE *)header + GET_BE_WORD(header->ScriptList)); - psc->script_count = GET_BE_WORD(script->ScriptCount); - - TRACE("Initialising %li scripts in this font.\n", psc->script_count); - - if (!psc->script_count) - return; - - if (!usp10_array_reserve((void **)&psc->scripts, &psc->scripts_size, psc->script_count, sizeof(*psc->scripts))) - ERR("Failed to allocate script array.\n"); - - for (i = 0; i < psc->script_count; ++i) - { - psc->scripts[i].tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], - script->ScriptRecord[i].ScriptTag[1], - script->ScriptRecord[i].ScriptTag[2], - script->ScriptRecord[i].ScriptTag[3]); - psc->scripts[i].gsub_table = (const BYTE *)script + GET_BE_WORD(script->ScriptRecord[i].Script); - } -} - -static void GPOS_expand_script_cache(ScriptCache *psc) +static void usp10_script_cache_add_script_list(ScriptCache *script_cache, + enum usp10_script_table table, const OT_ScriptList *list) { SIZE_T initial_count, count, i; - const OT_ScriptList *list; - const GPOS_Header *header; LoadedScript *script; OPENTYPE_TAG tag; - if (!(header = psc->GPOS_Table)) - return; + TRACE("script_cache %p, table %#x, list %p.\n", script_cache, table, list); - list = (const OT_ScriptList *)((const BYTE *)header + GET_BE_WORD(header->ScriptList)); if (!(count = GET_BE_WORD(list->ScriptCount))) return; - TRACE("Initialising %lu scripts in this font.\n", count); + TRACE("Adding %lu scripts.\n", count); - initial_count = psc->script_count; + initial_count = script_cache->script_count; for (i = 0; i < count; ++i) { tag = MS_MAKE_TAG(list->ScriptRecord[i].ScriptTag[0], @@ -2650,22 +2617,31 @@ static void GPOS_expand_script_cache(ScriptCache *psc) list->ScriptRecord[i].ScriptTag[2], list->ScriptRecord[i].ScriptTag[3]); - if (!(initial_count && (script = usp10_script_cache_get_script(psc, tag))) - && !(script = usp10_script_cache_add_script(psc, tag))) + if (!(initial_count && (script = usp10_script_cache_get_script(script_cache, tag))) + && !(script = usp10_script_cache_add_script(script_cache, tag))) return; - script->gpos_table = (const BYTE *)list + GET_BE_WORD(list->ScriptRecord[i].Script); + script->table[table] = (const BYTE *)list + GET_BE_WORD(list->ScriptRecord[i].Script); } } -static void _initialize_script_cache(ScriptCache *psc) +static void _initialize_script_cache(ScriptCache *script_cache) { - if (!psc->scripts_initialized) - { - GSUB_initialize_script_cache(psc); - GPOS_expand_script_cache(psc); - psc->scripts_initialized = TRUE; - } + const GPOS_Header *gpos_header; + const GSUB_Header *gsub_header; + + if (script_cache->scripts_initialized) + return; + + if ((gsub_header = script_cache->GSUB_Table)) + usp10_script_cache_add_script_list(script_cache, USP10_SCRIPT_TABLE_GSUB, + (const OT_ScriptList *)((const BYTE *)gsub_header + GET_BE_WORD(gsub_header->ScriptList))); + + if ((gpos_header = script_cache->GPOS_Table)) + usp10_script_cache_add_script_list(script_cache, USP10_SCRIPT_TABLE_GPOS, + (const OT_ScriptList *)((const BYTE *)gpos_header + GET_BE_WORD(gpos_header->ScriptList))); + + script_cache->scripts_initialized = TRUE; } HRESULT OpenType_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags) @@ -2716,10 +2692,10 @@ static void GSUB_initialize_language_cache(LoadedScript *script) { int i; - if (script->gsub_table) + if (script->table[USP10_SCRIPT_TABLE_GSUB]) { DWORD offset; - const OT_Script* table = script->gsub_table; + const OT_Script *table = script->table[USP10_SCRIPT_TABLE_GSUB]; script->language_count = GET_BE_WORD(table->LangSysCount); offset = GET_BE_WORD(table->DefaultLangSys); if (offset) @@ -2747,7 +2723,7 @@ static void GSUB_initialize_language_cache(LoadedScript *script) static void GPOS_expand_language_cache(LoadedScript *script) { int count; - const OT_Script* table = script->gpos_table; + const OT_Script *table = script->table[USP10_SCRIPT_TABLE_GPOS]; LoadedLanguage *language; DWORD offset; diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index eae0255..08024c9 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -161,10 +161,16 @@ typedef struct { LoadedFeature *features; } LoadedLanguage; +enum usp10_script_table +{ + USP10_SCRIPT_TABLE_GSUB = 0, + USP10_SCRIPT_TABLE_GPOS, + USP10_SCRIPT_TABLE_COUNT +}; + typedef struct { OPENTYPE_TAG tag; - const void *gsub_table; - const void *gpos_table; + const void *table[USP10_SCRIPT_TABLE_COUNT]; LoadedLanguage default_language; BOOL languages_initialized; LoadedLanguage *languages;

1 0

Stefan Leichter : strmdll: Add stub dll.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: 13861b7952684505fd4e850b2963926436b17b4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=13861b7952684505fd4e850b… Author: Stefan Leichter <sle85276(a)gmx.de> Date: Sun Mar 18 23:49:33 2018 +0100 strmdll: Add stub dll. Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/strmdll/Makefile.in | 4 ++++ dlls/strmdll/main.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/strmdll/strmdll.spec | 5 +++++ 5 files changed, 53 insertions(+) diff --git a/configure b/configure index 0ccf620..88ee44d 100755 --- a/configure +++ b/configure @@ -1512,6 +1512,7 @@ enable_stdole2_tlb enable_stdole32_tlb enable_sti enable_strmbase +enable_strmdll enable_strmiids enable_svrapi enable_sxs @@ -19005,6 +19006,7 @@ wine_fn_config_makefile dlls/sti/tests enable_tests wine_fn_config_makefile dlls/storage.dll16 enable_win16 wine_fn_config_makefile dlls/stress.dll16 enable_win16 wine_fn_config_makefile dlls/strmbase enable_strmbase +wine_fn_config_makefile dlls/strmdll enable_strmdll wine_fn_config_makefile dlls/strmiids enable_strmiids wine_fn_config_makefile dlls/svrapi enable_svrapi wine_fn_config_makefile dlls/sxs enable_sxs diff --git a/configure.ac b/configure.ac index 51a3a79..b6c94a5 100644 --- a/configure.ac +++ b/configure.ac @@ -3631,6 +3631,7 @@ WINE_CONFIG_MAKEFILE(dlls/sti/tests) WINE_CONFIG_MAKEFILE(dlls/storage.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/stress.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/strmbase) +WINE_CONFIG_MAKEFILE(dlls/strmdll) WINE_CONFIG_MAKEFILE(dlls/strmiids) WINE_CONFIG_MAKEFILE(dlls/svrapi) WINE_CONFIG_MAKEFILE(dlls/sxs) diff --git a/dlls/strmdll/Makefile.in b/dlls/strmdll/Makefile.in new file mode 100644 index 0000000..429cd12 --- /dev/null +++ b/dlls/strmdll/Makefile.in @@ -0,0 +1,4 @@ +MODULE = strmdll.dll + +C_SRCS = \ + main.c diff --git a/dlls/strmdll/main.c b/dlls/strmdll/main.c new file mode 100644 index 0000000..25bb5e2 --- /dev/null +++ b/dlls/strmdll/main.c @@ -0,0 +1,41 @@ +/* + * Copyright 2018 Stefan Leichter + * + * 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(strmdll); + +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/strmdll/strmdll.spec b/dlls/strmdll/strmdll.spec new file mode 100644 index 0000000..c50bcaa --- /dev/null +++ b/dlls/strmdll/strmdll.spec @@ -0,0 +1,5 @@ +@ stub CreateAsfFormatSet +@ stub NSSecurityLibraryInit +@ stub SelectCrabis +@ stub SelectHelper +@ stub SelectMediaStream

1 0

Alistair Leslie-Hughes : propsys: Add PSGetPropertyKeyFromName stub.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: cbd9354862fa044932b5a0cb7c4c8b141e0a4e3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbd9354862fa044932b5a0cb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 18 00:21:51 2018 +0000 propsys: Add PSGetPropertyKeyFromName stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index f518519..db20fd3 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -83,7 +83,7 @@ @ stub PSGetPropertyDescriptionByName @ stdcall PSGetPropertyDescriptionListFromString(wstr ptr ptr) @ stub PSGetPropertyFromPropertyStorage -@ stub PSGetPropertyKeyFromName +@ stdcall PSGetPropertyKeyFromName(wstr ptr) @ stdcall PSGetPropertySystem(ptr ptr) @ stub PSGetPropertyValue @ stub PSLookupPropertyHandlerCLSID diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 7631023..1dbaee4 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -268,6 +268,12 @@ HRESULT WINAPI PSGetPropertyDescriptionListFromString(LPCWSTR proplist, REFIID r return E_NOTIMPL; } +HRESULT WINAPI PSGetPropertyKeyFromName(PCWSTR name, PROPERTYKEY *key) +{ + FIXME("%s, %p\n", debugstr_w(name), key); + return E_NOTIMPL; +} + HRESULT WINAPI PSRefreshPropertySchema(void) { FIXME("\n");

1 0

Alistair Leslie-Hughes : ntoskrnl.exe: Dont forward some msvcrt functions.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: 882d70fe3968b62ff36df351f050f021185db422 URL: https://source.winehq.org/git/wine.git/?a=commit;h=882d70fe3968b62ff36df351… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 18 06:40:13 2018 +0000 ntoskrnl.exe: Dont forward some msvcrt functions. 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 | 49 +++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 12 ++++----- 2 files changed, 55 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c9871cc..deca120 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3291,3 +3291,52 @@ PKEVENT WINAPI IoCreateNotificationEvent(UNICODE_STRING *name, HANDLE *handle) FIXME( "stub: %s %p\n", debugstr_us(name), handle ); return NULL; } + + +/********************************************************************* + * memcpy (NTOSKRNL.@) + * + * NOTES + * Behaves like memmove. + */ +void * __cdecl NTOSKRNL_memcpy( void *dst, const void *src, size_t n ) +{ + return memmove( dst, src, n ); +} + +/********************************************************************* + * memset (NTOSKRNL.@) + */ +void * __cdecl NTOSKRNL_memset( void *dst, int c, size_t n ) +{ + return memset( dst, c, n ); +} + +int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ) +{ + return strcasecmp( str1, str2 ); +} + +/********************************************************************* + * _strnicmp (NTOSKRNL.@) + */ +int __cdecl _strnicmp( LPCSTR str1, LPCSTR str2, size_t n ) +{ + return strncasecmp( str1, str2, n ); +} + +/********************************************************************* + * _wcsnicmp (NTOSKRNL.@) + */ +INT __cdecl NTOSKRNL__wcsnicmp( LPCWSTR str1, LPCWSTR str2, INT n ) +{ + return strncmpiW( str1, str2, n ); +} + +/********************************************************************* + * wcsncmp (NTOSKRNL.@) + */ +INT __cdecl NTOSKRNL_wcsncmp( LPCWSTR str1, LPCWSTR str2, INT n ) +{ + return strncmpW( str1, str2, n ); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 9464b38..2f54728 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1423,9 +1423,9 @@ @ cdecl -private _purecall() msvcrt._purecall @ varargs -private _snprintf(ptr long str) msvcrt._snprintf @ varargs -private _snwprintf(ptr long wstr) msvcrt._snwprintf -@ cdecl -private _stricmp(str str) msvcrt._stricmp +@ cdecl -private _stricmp(str str) @ cdecl -private _strlwr(str) msvcrt._strlwr -@ cdecl -private _strnicmp(str str long) msvcrt._strnicmp +@ cdecl -private _strnicmp(str str long) _strnicmp @ cdecl -private _strnset(str long long) msvcrt._strnset @ cdecl -private _strrev(str) msvcrt._strrev @ cdecl -private _strset(str long) msvcrt._strset @@ -1434,7 +1434,7 @@ @ cdecl -private _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf @ cdecl -private _wcsicmp(wstr wstr) msvcrt._wcsicmp @ cdecl -private _wcslwr(wstr) msvcrt._wcslwr -@ cdecl -private _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp +@ cdecl -private _wcsnicmp(wstr wstr long) NTOSKRNL__wcsnicmp @ cdecl -private _wcsnset(wstr long long) msvcrt._wcsnset @ cdecl -private _wcsrev(wstr) msvcrt._wcsrev @ cdecl -private _wcsupr(wstr) msvcrt._wcsupr @@ -1449,9 +1449,9 @@ @ cdecl -private mbstowcs(ptr str long) msvcrt.mbstowcs @ cdecl -private mbtowc(ptr str long) msvcrt.mbtowc @ cdecl -private memchr(ptr long long) msvcrt.memchr -@ cdecl -private memcpy(ptr ptr long) msvcrt.memcpy +@ cdecl -private memcpy(ptr ptr long) NTOSKRNL_memcpy @ cdecl -private memmove(ptr ptr long) msvcrt.memmove -@ cdecl -private memset(ptr long long) msvcrt.memset +@ cdecl -private memset(ptr long long) NTOSKRNL_memset @ cdecl -private qsort(ptr long long ptr) msvcrt.qsort @ cdecl -private rand() msvcrt.rand @ varargs -private sprintf(ptr str) msvcrt.sprintf @@ -1482,7 +1482,7 @@ @ cdecl -private wcscspn(wstr wstr) msvcrt.wcscspn @ cdecl -private wcslen(wstr) msvcrt.wcslen @ cdecl -private wcsncat(wstr wstr long) msvcrt.wcsncat -@ cdecl -private wcsncmp(wstr wstr long) msvcrt.wcsncmp +@ cdecl -private wcsncmp(wstr wstr long) NTOSKRNL_wcsncmp @ cdecl -private wcsncpy(ptr wstr long) msvcrt.wcsncpy @ cdecl -private wcsrchr(wstr long) msvcrt.wcsrchr @ cdecl -private wcsspn(wstr wstr) msvcrt.wcsspn

1 0

Michael Müller : bcrypt: Implement BCryptGetProperty for BCRYPT_AUTH_TAG_LENGTH.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: 313c06bfbfde54894a47db69608a193ca5cbcdd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=313c06bfbfde54894a47db69… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Mar 19 11:16:14 2018 +0000 bcrypt: Implement BCryptGetProperty for BCRYPT_AUTH_TAG_LENGTH. 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 | 14 ++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 16 ++++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 55901f9..fa80318 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -566,6 +566,20 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop } return STATUS_SUCCESS; } + if (!strcmpW( prop, BCRYPT_AUTH_TAG_LENGTH )) + { + BCRYPT_AUTH_TAG_LENGTHS_STRUCT *tag_length = (void *)buf; + if (alg->mode != MODE_ID_GCM) return STATUS_NOT_SUPPORTED; + *ret_size = sizeof(*tag_length); + if (tag_length && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + if (tag_length) + { + tag_length->dwMinLength = 12; + tag_length->dwMaxLength = 16; + tag_length->dwIncrement = 1; + } + return STATUS_SUCCESS; + } break; default: diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index f235cc7..ba2011f 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -709,24 +709,24 @@ static void test_BCryptEncrypt(void) size = 0; ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0); - todo_wine ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); size = 0; ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0); - todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - todo_wine ok(size == sizeof(tag_length), "got %u\n", size); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == sizeof(tag_length), "got %u\n", size); size = 0; memset(&tag_length, 0, sizeof(tag_length)); ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, (UCHAR*)&tag_length, sizeof(tag_length), &size, 0); - todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - todo_wine ok(size == sizeof(tag_length), "got %u\n", size); - todo_wine ok(tag_length.dwMinLength == 12, "Expected 12, got %d\n", tag_length.dwMinLength); - todo_wine ok(tag_length.dwMaxLength == 16, "Expected 16, got %d\n", tag_length.dwMaxLength); - todo_wine ok(tag_length.dwIncrement == 1, "Expected 1, got %d\n", tag_length.dwIncrement); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == sizeof(tag_length), "got %u\n", size); + ok(tag_length.dwMinLength == 12, "Expected 12, got %d\n", tag_length.dwMinLength); + ok(tag_length.dwMaxLength == 16, "Expected 16, got %d\n", tag_length.dwMaxLength); + ok(tag_length.dwIncrement == 1, "Expected 1, got %d\n", tag_length.dwIncrement); len = 0xdeadbeef; size = sizeof(len);

1 0

Michael Müller : bcrypt: Implement BCryptGetProperty for BCRYPT_CHAINING_MODE.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: ba1ed4432c98c23ecaa03eebbc3d8309b8fa550f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba1ed4432c98c23ecaa03eeb… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Mar 19 11:16:12 2018 +0000 bcrypt: Implement BCryptGetProperty for BCRYPT_CHAINING_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 | 19 ++++++++++--------- dlls/bcrypt/tests/bcrypt.c | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 2f56604..55901f9 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -540,17 +540,18 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop } if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) { - if (size >= sizeof(BCRYPT_CHAIN_MODE_CBC) * sizeof(WCHAR)) + const WCHAR *mode; + switch (alg->mode) { - memcpy(buf, BCRYPT_CHAIN_MODE_CBC, sizeof(BCRYPT_CHAIN_MODE_CBC)); - *ret_size = sizeof(BCRYPT_CHAIN_MODE_CBC) * sizeof(WCHAR); - return STATUS_SUCCESS; - } - else - { - *ret_size = sizeof(BCRYPT_CHAIN_MODE_CBC) * sizeof(WCHAR); - return STATUS_BUFFER_TOO_SMALL; + case MODE_ID_GCM: mode = BCRYPT_CHAIN_MODE_GCM; break; + case MODE_ID_CBC: mode = BCRYPT_CHAIN_MODE_CBC; break; + default: return STATUS_NOT_IMPLEMENTED; } + + *ret_size = 64; + if (size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + memcpy( buf, mode, (strlenW(mode) + 1) * sizeof(WCHAR) ); + return STATUS_SUCCESS; } if (!strcmpW( prop, BCRYPT_KEY_LENGTHS )) { diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index f8b63a9..f235cc7 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -483,7 +483,7 @@ static void test_aes(void) memset(mode, 0, sizeof(mode)); ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - todo_wine ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_GCM), "got %s\n", wine_dbgstr_w((const WCHAR *)mode)); + ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_GCM), "got %s\n", wine_dbgstr_w((const WCHAR *)mode)); ok(size == 64, "got %u\n", size); test_alg_name(alg, "AES");

1 0

Michael Müller : bcrypt: Implement BCryptSetProperty for algorithms.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: 7ec0892ab7cc2ef12fd50931edb5c8ed57907c8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ec0892ab7cc2ef12fd50931… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Mar 19 11:16:11 2018 +0000 bcrypt: Implement BCryptSetProperty for algorithms. 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 | 64 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/bcrypt/tests/bcrypt.c | 19 +++++++++++--- 2 files changed, 77 insertions(+), 6 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 8af43c8..2f56604 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -192,6 +192,12 @@ enum alg_id ALG_ID_SHA512 }; +enum mode_id +{ + MODE_ID_CBC, + MODE_ID_GCM +}; + #define MAX_HASH_OUTPUT_BYTES 64 #define MAX_HASH_BLOCK_BITS 1024 @@ -216,6 +222,7 @@ struct algorithm { struct object hdr; enum alg_id id; + enum mode_id mode; BOOL hmac; }; @@ -298,6 +305,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR if (!(alg = heap_alloc( sizeof(*alg) ))) return STATUS_NO_MEMORY; alg->hdr.magic = MAGIC_ALG; alg->id = alg_id; + alg->mode = MODE_ID_CBC; alg->hmac = flags & BCRYPT_ALG_HANDLE_HMAC_FLAG; *handle = alg; @@ -567,6 +575,38 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS set_alg_property( struct algorithm *alg, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) +{ + switch (alg->id) + { + case ALG_ID_AES: + if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) + { + if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_CBC, size )) + { + alg->mode = MODE_ID_CBC; + return STATUS_SUCCESS; + } + else if (!strncmpW( (WCHAR *)value, BCRYPT_CHAIN_MODE_GCM, size )) + { + alg->mode = MODE_ID_GCM; + return STATUS_SUCCESS; + } + else + { + FIXME( "unsupported mode %s\n", debugstr_wn( (WCHAR *)value, size ) ); + return STATUS_NOT_IMPLEMENTED; + } + } + FIXME( "unsupported aes algorithm property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; + + default: + FIXME( "unsupported algorithm %u\n", alg->id ); + return STATUS_NOT_IMPLEMENTED; + } +} + static NTSTATUS get_hash_property( const struct hash *hash, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { NTSTATUS status; @@ -606,8 +646,28 @@ 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 ) { - FIXME( "%p, %s, %p, %u, %08x\n", handle, debugstr_w(prop), value, size, flags ); - return STATUS_NOT_IMPLEMENTED; + 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, diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 6cefe13..f8b63a9 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -463,7 +463,7 @@ static void test_aes(void) memset(mode, 0, sizeof(mode)); ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "got %s\n", mode); + ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "got %s\n", wine_dbgstr_w((const WCHAR *)mode)); ok(size == 64, "got %u\n", size); size = 0; @@ -475,6 +475,17 @@ static void test_aes(void) ok(key_lengths.dwMaxLength == 256, "Expected 256, got %d\n", key_lengths.dwMaxLength); ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement); + memcpy(mode, BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM)); + ret = pBCryptSetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + size = 0; + memset(mode, 0, sizeof(mode)); + ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + todo_wine ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_GCM), "got %s\n", wine_dbgstr_w((const WCHAR *)mode)); + ok(size == 64, "got %u\n", size); + test_alg_name(alg, "AES"); ret = pBCryptCloseAlgorithmProvider(alg, 0); @@ -512,7 +523,7 @@ static void test_BCryptGenerateSymmetricKey(void) ret = pBCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_CBC, sizeof(BCRYPT_CHAIN_MODE_CBC), 0); - todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); size = 0xdeadbeef; ret = pBCryptEncrypt(key, NULL, 0, NULL, NULL, 0, NULL, 0, &size, 0); @@ -701,7 +712,7 @@ static void test_BCryptEncrypt(void) todo_wine ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM), 0); - todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); size = 0; ret = BCryptGetProperty(aes, BCRYPT_AUTH_TAG_LENGTH, NULL, 0, &size, 0); @@ -939,7 +950,7 @@ static void test_BCryptDecrypt(void) ******************/ ret = BCryptSetProperty(aes, BCRYPT_CHAINING_MODE, (UCHAR*)BCRYPT_CHAIN_MODE_GCM, sizeof(BCRYPT_CHAIN_MODE_GCM), 0); - todo_wine ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); ret = pBCryptGenerateSymmetricKey(aes, &key, buf, len, secret, sizeof(secret), 0);

1 0

Sebastian Lackner : bcrypt: Pass object to get_{alg, hash}_property instead of alg_id.
by Alexandre Julliard 19 Mar '18

19 Mar '18

Module: wine Branch: master Commit: fb8da6ca0c4016cfe0cb71efefc8454ee5a28bb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb8da6ca0c4016cfe0cb71ef… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 19 11:16:09 2018 +0000 bcrypt: Pass object to get_{alg, hash}_property instead of alg_id. 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 | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 6e47349..8af43c8 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -510,15 +510,15 @@ static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR * return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { NTSTATUS status; - status = generic_alg_property( id, prop, buf, size, ret_size ); + status = generic_alg_property( alg->id, prop, buf, size, ret_size ); if (status != STATUS_NOT_IMPLEMENTED) return status; - switch (id) + switch (alg->id) { case ALG_ID_AES: if (!strcmpW( prop, BCRYPT_BLOCK_LENGTH )) @@ -567,11 +567,11 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS get_hash_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +static NTSTATUS get_hash_property( const struct hash *hash, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { NTSTATUS status; - status = generic_alg_property( id, prop, buf, size, ret_size ); + status = generic_alg_property( hash->alg_id, prop, buf, size, ret_size ); if (status == STATUS_NOT_IMPLEMENTED) FIXME( "unsupported property %s\n", debugstr_w(prop) ); return status; @@ -591,12 +591,12 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu case MAGIC_ALG: { const struct algorithm *alg = (const struct algorithm *)object; - return get_alg_property( alg->id, prop, buffer, count, res ); + return get_alg_property( alg, prop, buffer, count, res ); } case MAGIC_HASH: { const struct hash *hash = (const struct hash *)object; - return get_hash_property( hash->alg_id, prop, buffer, count, res ); + return get_hash_property( hash, prop, buffer, count, res ); } default: WARN( "unknown magic %08x\n", object->magic ); @@ -798,7 +798,7 @@ struct key #endif #if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 -static ULONG get_block_size( enum alg_id alg ) +static ULONG get_block_size( struct algorithm *alg ) { ULONG ret = 0, size = sizeof(ret); get_alg_property( alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&ret, sizeof(ret), &size ); @@ -827,27 +827,27 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U #endif #if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) -static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, ULONG secret_len ) +static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) { UCHAR *buffer; if (!libgnutls_handle) return STATUS_INTERNAL_ERROR; - switch (id) + switch (alg->id) { case ALG_ID_AES: break; default: - FIXME( "algorithm %u not supported\n", id ); + FIXME( "algorithm %u not supported\n", alg->id ); return STATUS_NOT_SUPPORTED; } - if (!(key->block_size = get_block_size( id ))) return STATUS_INVALID_PARAMETER; + if (!(key->block_size = get_block_size( alg ))) return STATUS_INVALID_PARAMETER; if (!(buffer = heap_alloc( secret_len ))) return STATUS_NO_MEMORY; memcpy( buffer, secret, secret_len ); - key->alg_id = id; + key->alg_id = alg->id; key->handle = 0; /* initialized on first use */ key->secret = buffer; key->secret_len = secret_len; @@ -937,25 +937,25 @@ static NTSTATUS key_destroy( struct key *key ) return STATUS_SUCCESS; } #elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 -static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, ULONG secret_len ) +static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) { UCHAR *buffer; - switch (id) + switch (alg->id) { case ALG_ID_AES: break; default: - FIXME( "algorithm %u not supported\n", id ); + FIXME( "algorithm %u not supported\n", alg->id ); return STATUS_NOT_SUPPORTED; } - if (!(key->block_size = get_block_size( id ))) return STATUS_INVALID_PARAMETER; + if (!(key->block_size = get_block_size( alg ))) return STATUS_INVALID_PARAMETER; if (!(buffer = heap_alloc( secret_len ))) return STATUS_NO_MEMORY; memcpy( buffer, secret, secret_len ); - key->alg_id = id; + key->alg_id = alg->id; key->ref_encrypt = NULL; /* initialized on first use */ key->ref_decrypt = NULL; key->secret = buffer; @@ -1034,7 +1034,7 @@ static NTSTATUS key_destroy( struct key *key ) return STATUS_SUCCESS; } #else -static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, ULONG secret_len ) +static NTSTATUS key_init( struct key *key, struct algorithm *alg, const UCHAR *secret, ULONG secret_len ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; @@ -1089,7 +1089,7 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ if (!(key = heap_alloc( sizeof(*key) ))) return STATUS_NO_MEMORY; key->hdr.magic = MAGIC_KEY; - if ((status = key_init( key, alg->id, secret, secret_len ))) + if ((status = key_init( key, alg, secret, secret_len ))) { heap_free( key ); return status;

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
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