December 2019 - Wine-Commits

Gabriel Ivăncescu : vbscript: Copy the variable names into the script dispatch's heap.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: wine Branch: master Commit: 99af868d7cd8cbbc8f83bccbc0537c22025c8db1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99af868d7cd8cbbc8f83bccb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 6 13:45:35 2019 +0100 vbscript: Copy the variable names into the script dispatch's heap. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 94daace4fe..e068d19161 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -63,6 +63,14 @@ typedef struct { EXCEPINFO ei; } VBScriptError; +static inline WCHAR *heap_pool_strdup(heap_pool_t *heap, const WCHAR *str) +{ + size_t size = (lstrlenW(str) + 1) * sizeof(WCHAR); + WCHAR *ret = heap_pool_alloc(heap, size); + if (ret) memcpy(ret, str, size); + return ret; +} + static void change_state(VBScript *This, SCRIPTSTATE state) { if(This->state == state) @@ -120,7 +128,9 @@ static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res if (!(var = heap_pool_alloc(&obj->heap, sizeof(*var)))) return E_OUTOFMEMORY; - var->name = code->main_code.vars[i].name; + var->name = heap_pool_strdup(&obj->heap, code->main_code.vars[i].name); + if (!var->name) + return E_OUTOFMEMORY; V_VT(&var->v) = VT_EMPTY; var->is_const = FALSE; var->array = NULL;

1 0

Gabriel Ivăncescu : vbscript: Reference count the vbscode_t.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: wine Branch: master Commit: 6c2f99c84e9921f03b46c09e01f17d8c01d32681 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c2f99c84e9921f03b46c09e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 6 13:45:28 2019 +0100 vbscript: Reference count the vbscode_t. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 4 +++- dlls/vbscript/vbscript.c | 11 +++++++++-- dlls/vbscript/vbscript.h | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 9ddfacfb41..d8ae0fc313 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1832,7 +1832,8 @@ void release_vbscode(vbscode_t *code) { unsigned i; - list_remove(&code->entry); + if(--code->ref) + return; for(i=0; i < code->bstr_cnt; i++) SysFreeString(code->bstr_pool[i]); @@ -1875,6 +1876,7 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) ret->main_code.type = FUNC_GLOBAL; ret->main_code.code_ctx = ret; + ret->ref = 1; list_init(&ret->entry); return ret; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index f7890362c6..94daace4fe 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -223,7 +223,10 @@ static void release_script(script_ctx_t *ctx) if(code->last_class) code->last_class->next = NULL; } else + { + list_remove(&code->entry); release_vbscode(code); + } } while(!list_empty(&ctx->named_items)) { @@ -262,8 +265,12 @@ static void release_script(script_ctx_t *ctx) static void release_code_list(script_ctx_t *ctx) { - while(!list_empty(&ctx->code_list)) - release_vbscode(LIST_ENTRY(list_head(&ctx->code_list), vbscode_t, entry)); + while(!list_empty(&ctx->code_list)) { + vbscode_t *iter = LIST_ENTRY(list_head(&ctx->code_list), vbscode_t, entry); + + list_remove(&iter->entry); + release_vbscode(iter); + } } static void decrease_state(VBScript *This, SCRIPTSTATE state) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index f4e7bc7b2d..2f1b61b1ab 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -336,6 +336,7 @@ struct _function_t { struct _vbscode_t { instr_t *instrs; WCHAR *source; + unsigned ref; BOOL option_explicit;

1 0

Derek Lesho : bcrypt: Add more BCryptSignHash tests.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: wine Branch: master Commit: 741f8ae24ec33a122279b5efd006345e259151cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=741f8ae24ec33a122279b5ef… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Dec 6 15:42:50 2019 +0100 bcrypt: Add more BCryptSignHash tests. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index d125e0c89d..198acbf721 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2049,6 +2049,9 @@ static void test_BCryptSignHash(void) { static UCHAR hash[] = {0x7e,0xe3,0x74,0xe7,0xc5,0x0b,0x6b,0x70,0xdb,0xab,0x32,0x6d,0x1d,0x51,0xd6,0x74,0x79,0x8e,0x5b,0x4b}; + static UCHAR hash_sha256[] = + {0x25,0x2f,0x10,0xc8,0x36,0x10,0xeb,0xca,0x1a,0x05,0x9c,0x0b,0xae,0x82,0x55,0xeb,0xa2,0xf9,0x5b,0xe4, + 0xd1,0xd7,0xbC,0xfA,0x89,0xd7,0x24,0x8a,0x82,0xd9,0xf1,0x11}; BCRYPT_PKCS1_PADDING_INFO pad; BCRYPT_ALG_HANDLE alg; BCRYPT_KEY_HANDLE key; @@ -2056,6 +2059,8 @@ static void test_BCryptSignHash(void) NTSTATUS ret; ULONG len; + /* RSA */ + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_RSA_ALGORITHM, NULL, 0); if (ret) { @@ -2087,6 +2092,14 @@ static void test_BCryptSignHash(void) len = 0; memset(sig, 0, sizeof(sig)); + + /* inference of padding info on RSA not supported */ + ret = pBCryptSignHash(key, NULL, hash, sizeof(hash), sig, sizeof(sig), &len, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + ret = pBCryptSignHash(key, &pad, hash, sizeof(hash), sig, 0, &len, BCRYPT_PAD_PKCS1); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ret = pBCryptSignHash(key, &pad, hash, sizeof(hash), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); ok(!ret, "got %08x\n", ret); ok(len == 64, "got %u\n", len); @@ -2099,6 +2112,42 @@ static void test_BCryptSignHash(void) ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(!ret, "got %08x\n", ret); + + /* ECDSA */ + + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_ECDSA_P256_ALGORITHM, NULL, 0); + if (ret) + { + win_skip("failed to open ECDSA provider: %08x\n", ret); + return; + } + + ret = pBCryptGenerateKeyPair(alg, &key, 256, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + ret = pBCryptFinalizeKeyPair(key, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + memset(sig, 0, sizeof(sig)); + len = 0; + + /* automatically detects padding info */ + ret = pBCryptSignHash(key, NULL, hash, sizeof(hash), sig, sizeof(sig), &len, 0); + ok (!ret, "got %08x\n", ret); + ok (len == 64, "got %u\n", len); + + ret = pBCryptVerifySignature(key, NULL, hash, sizeof(hash), sig, len, 0); + ok(!ret, "got %08x\n", ret); + + /* mismatch info (SHA-1 != SHA-256) */ + ret = pBCryptSignHash(key, &pad, hash_sha256, sizeof(hash_sha256), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); + ok (ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + ret = pBCryptDestroyKey(key); + ok(!ret, "got %08x\n", ret); + + ret = pBCryptCloseAlgorithmProvider(alg, 0); + ok(!ret, "got %08x\n", ret); } static void test_BCryptEnumAlgorithms(void)

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetFuncDesc.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: wine Branch: master Commit: 2d753e2aa2e600f6739332414317e3ec5a25c2e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d753e2aa2e600f673933241… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 6 13:46:00 2019 +0100 vbscript: Implement ScriptTypeInfo_GetFuncDesc. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 0eb8edf567..99d7dc5f5b 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -641,10 +641,33 @@ static HRESULT WINAPI ScriptTypeInfo_GetTypeComp(ITypeInfo *iface, ITypeComp **p static HRESULT WINAPI ScriptTypeInfo_GetFuncDesc(ITypeInfo *iface, UINT index, FUNCDESC **ppFuncDesc) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + function_t *func; + FUNCDESC *desc; + UINT i; - FIXME("(%p)->(%u %p)\n", This, index, ppFuncDesc); + TRACE("(%p)->(%u %p)\n", This, index, ppFuncDesc); - return E_NOTIMPL; + if (!ppFuncDesc) return E_INVALIDARG; + if (index >= This->num_funcs) return TYPE_E_ELEMENTNOTFOUND; + func = This->funcs[index].func; + + /* Store the parameter array after the FUNCDESC structure */ + desc = heap_alloc_zero(sizeof(*desc) + sizeof(ELEMDESC) * func->arg_cnt); + if (!desc) return E_OUTOFMEMORY; + + desc->memid = This->funcs[index].memid; + desc->funckind = FUNC_DISPATCH; + desc->invkind = INVOKE_FUNC; + desc->callconv = CC_STDCALL; + desc->cParams = func->arg_cnt; + desc->elemdescFunc.tdesc.vt = (func->type == FUNC_SUB) ? VT_VOID : VT_VARIANT; + + if (func->arg_cnt) desc->lprgelemdescParam = (ELEMDESC*)(desc + 1); + for (i = 0; i < func->arg_cnt; i++) + desc->lprgelemdescParam[i].tdesc.vt = VT_VARIANT; + + *ppFuncDesc = desc; + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetVarDesc(ITypeInfo *iface, UINT index, VARDESC **ppVarDesc) @@ -783,7 +806,9 @@ static void WINAPI ScriptTypeInfo_ReleaseFuncDesc(ITypeInfo *iface, FUNCDESC *pF { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); - FIXME("(%p)->(%p)\n", This, pFuncDesc); + TRACE("(%p)->(%p)\n", This, pFuncDesc); + + heap_free(pFuncDesc); } static void WINAPI ScriptTypeInfo_ReleaseVarDesc(ITypeInfo *iface, VARDESC *pVarDesc)

1 0

Gabriel Ivăncescu : vbscript: Store the necessary function and variable info in the script TypeInfo.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: wine Branch: master Commit: 3d148b8d6f4068538ec196e2c05ec3ab3c8d15bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d148b8d6f4068538ec196e2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 6 13:45:44 2019 +0100 vbscript: Store the necessary function and variable info in the script TypeInfo. The TypeInfo is built when it is retrieved and frozen at that moment, even if the script changes after that and more identifiers are added to it, or existing ones replaced. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbdisp.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 5 +++++ 2 files changed, 50 insertions(+) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 60a79659df..0e7fee0ed4 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -527,9 +527,20 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) return S_OK; } +struct typeinfo_func { + function_t *func; + MEMBERID memid; +}; + typedef struct { ITypeInfo ITypeInfo_iface; LONG ref; + + UINT num_vars; + UINT num_funcs; + struct typeinfo_func *funcs; + + ScriptDisp *disp; } ScriptTypeInfo; static inline ScriptTypeInfo *ScriptTypeInfo_from_ITypeInfo(ITypeInfo *iface) @@ -569,11 +580,17 @@ static ULONG WINAPI ScriptTypeInfo_Release(ITypeInfo *iface) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); LONG ref = InterlockedDecrement(&This->ref); + UINT i; TRACE("(%p) ref=%d\n", This, ref); if (!ref) { + for (i = 0; i < This->num_funcs; i++) + release_vbscode(This->funcs[i].func->code_ctx); + + IDispatchEx_Release(&This->disp->IDispatchEx_iface); + heap_free(This->funcs); heap_free(This); } return ref; @@ -857,6 +874,8 @@ static HRESULT WINAPI ScriptDisp_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); ScriptTypeInfo *type_info; + UINT num_funcs = 0; + unsigned i, j; TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ret); @@ -866,8 +885,34 @@ static HRESULT WINAPI ScriptDisp_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC if(!(type_info = heap_alloc(sizeof(*type_info)))) return E_OUTOFMEMORY; + for(i = 0; i < This->global_funcs_cnt; i++) + if(This->global_funcs[i]->is_public) + num_funcs++; + type_info->ITypeInfo_iface.lpVtbl = &ScriptTypeInfoVtbl; type_info->ref = 1; + type_info->num_funcs = num_funcs; + type_info->num_vars = This->global_vars_cnt; + type_info->disp = This; + + type_info->funcs = heap_alloc(sizeof(*type_info->funcs) * num_funcs); + if(!type_info->funcs) + { + heap_free(type_info); + return E_OUTOFMEMORY; + } + + for(j = 0, i = 0; i < This->global_funcs_cnt; i++) + { + if(!This->global_funcs[i]->is_public) continue; + + type_info->funcs[j].memid = i + 1 + DISPID_FUNCTION_MASK; + type_info->funcs[j].func = This->global_funcs[i]; + grab_vbscode(This->global_funcs[i]->code_ctx); + j++; + } + + IDispatchEx_AddRef(&This->IDispatchEx_iface); *ret = &type_info->ITypeInfo_iface; return S_OK; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 2f1b61b1ab..d14b73ce82 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -357,6 +357,11 @@ struct _vbscode_t { struct list entry; }; +static inline void grab_vbscode(vbscode_t *code) +{ + code->ref++; +} + void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,vbscode_t**) DECLSPEC_HIDDEN; HRESULT compile_procedure(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,class_desc_t**) DECLSPEC_HIDDEN;

1 0

Gabriel Ivăncescu : vbscript: Move the global lists to the script dispatch object.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: wine Branch: master Commit: cdc5ac52fc5e21e98e76147ef160c86d7e740b02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdc5ac52fc5e21e98e76147e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 6 13:45:21 2019 +0100 vbscript: Move the global lists to the script dispatch object. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 15 ++++++----- dlls/vbscript/interp.c | 39 ++++++++++++++------------- dlls/vbscript/vbdisp.c | 34 ++++++++++++++++------- dlls/vbscript/vbscript.c | 70 ++++++++++++++++-------------------------------- dlls/vbscript/vbscript.h | 41 ++++++++++++++-------------- 5 files changed, 97 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cdc5ac52fc5e21e98e76…

1 0

Piotr Caban : msvcrt: Support mixing length and width in scanf format.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: wine Branch: master Commit: 7695433c0511e0cd3c035e17a1ec10d86f30dd40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7695433c0511e0cd3c035e17… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 6 15:57:09 2019 +0100 msvcrt: Support mixing length and width in scanf format. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45967 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.h | 13 +++++++------ dlls/msvcrt/tests/scanf.c | 24 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index de2a2af975..da65bf8a6b 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -197,14 +197,14 @@ _FUNCTION_ { format++; suppress=1; } - /* look for width specification */ - while (_ISDIGIT_(*format)) { - width*=10; - width+=*format++ - '0'; - } - if (width==0) width=-1; /* no width spec seen */ /* read prefix (if any) */ while (!prefix_finished) { + /* look for width specification */ + while (_ISDIGIT_(*format)) { + width *= 10; + width += *format++ - '0'; + } + switch(*format) { case 'h': h_prefix++; break; case 'l': @@ -228,6 +228,7 @@ _FUNCTION_ { } if (!prefix_finished) format++; } + if (width==0) width=-1; /* no width spec seen */ /* read type */ switch(*format) { case 'p': diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 5db9d43935..95fd043e6f 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -205,6 +205,30 @@ static void test_sscanf( void ) ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ok(result == 0xdead614e, "Wrong number read (%x)\n", result); + result = 0xdeadbeef; + strcpy(buffer,"12345678"); + ret = p_sscanf(buffer, "%02hd", &result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(result == 0xdead000c, "Wrong number read (%x)\n", result); + + result = 0xdeadbeef; + strcpy(buffer,"12345678"); + ret = p_sscanf(buffer, "%h02d", &result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(result == 0xdead000c, "Wrong number read (%x)\n", result); + + result = 0xdeadbeef; + strcpy(buffer,"12345678"); + ret = p_sscanf(buffer, "%000h02d", &result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(result == 0xdead000c, "Wrong number read (%x)\n", result); + + result = 0xdeadbeef; + strcpy(buffer,"12345678"); + ret = p_sscanf(buffer, "%2h0d", &result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(result == 0xdead614e, "Wrong number read (%x)\n", result); + result = 0xdeadbeef; ret = p_sscanf(buffer, "%hhd", &result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret);

1 0

Jacek Caban : oleaut32: Fix sharing options in TLB_ReadTypeLib.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: wine Branch: master Commit: 62ea59774bfb455737e14fd4ffdc70e2998c1dfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=62ea59774bfb455737e14fd4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 6 15:48:30 2019 +0100 oleaut32: Fix sharing options in TLB_ReadTypeLib. Spotted by Donna Whisnant and Kevin Puetz. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index e629ed51d5..eb713a4e2f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3329,7 +3329,7 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath if(file != pszFileName) heap_free(file); - h = CreateFileW(pszPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + h = CreateFileW(pszPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(h != INVALID_HANDLE_VALUE){ FILE_NAME_INFORMATION size_info; BOOL br;

1 0

Derek Lesho : bcrypt: Add support for signing hashes with ECDSA keys.
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: wine Branch: master Commit: 741f76fc2c9203105ca7f87c0014bb5a9da4d936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=741f76fc2c9203105ca7f87c… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Dec 6 15:42:48 2019 +0100 bcrypt: Add support for signing hashes with ECDSA keys. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 147 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 130 insertions(+), 17 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index a6a07fff19..28a14e9b85 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -92,6 +92,7 @@ MAKE_FUNCPTR(gnutls_cipher_decrypt2); MAKE_FUNCPTR(gnutls_cipher_deinit); MAKE_FUNCPTR(gnutls_cipher_encrypt2); MAKE_FUNCPTR(gnutls_cipher_init); +MAKE_FUNCPTR(gnutls_decode_rs_value); MAKE_FUNCPTR(gnutls_global_deinit); MAKE_FUNCPTR(gnutls_global_init); MAKE_FUNCPTR(gnutls_global_set_log_function); @@ -189,6 +190,7 @@ BOOL gnutls_initialize(void) LOAD_FUNCPTR(gnutls_cipher_deinit) LOAD_FUNCPTR(gnutls_cipher_encrypt2) LOAD_FUNCPTR(gnutls_cipher_init) + LOAD_FUNCPTR(gnutls_decode_rs_value) LOAD_FUNCPTR(gnutls_global_deinit) LOAD_FUNCPTR(gnutls_global_init) LOAD_FUNCPTR(gnutls_global_set_log_function) @@ -711,6 +713,7 @@ NTSTATUS key_asymmetric_generate( struct key *key ) break; case ALG_ID_ECDH_P256: + case ALG_ID_ECDSA_P256: pk_alg = GNUTLS_PK_ECC; /* compatible with ECDSA and ECDH */ bitlen = GNUTLS_CURVE_TO_BITS( GNUTLS_ECC_CURVE_SECP256R1 ); break; @@ -1029,6 +1032,17 @@ static NTSTATUS prepare_gnutls_signature( struct key *key, UCHAR *signature, ULO } } +static gnutls_digest_algorithm_t get_digest_from_id( const WCHAR *alg_id ) +{ + if (!strcmpW( alg_id, BCRYPT_SHA1_ALGORITHM )) return GNUTLS_DIG_SHA1; + if (!strcmpW( alg_id, BCRYPT_SHA256_ALGORITHM )) return GNUTLS_DIG_SHA256; + if (!strcmpW( alg_id, BCRYPT_SHA384_ALGORITHM )) return GNUTLS_DIG_SHA384; + if (!strcmpW( alg_id, BCRYPT_SHA512_ALGORITHM )) return GNUTLS_DIG_SHA512; + if (!strcmpW( alg_id, BCRYPT_MD2_ALGORITHM )) return GNUTLS_DIG_MD2; + if (!strcmpW( alg_id, BCRYPT_MD5_ALGORITHM )) return GNUTLS_DIG_MD5; + return -1; +} + NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULONG hash_len, UCHAR *signature, ULONG signature_len, DWORD flags ) { @@ -1068,11 +1082,7 @@ NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULO if (!(flags & BCRYPT_PAD_PKCS1) || !info) return STATUS_INVALID_PARAMETER; if (!info->pszAlgId) return STATUS_INVALID_SIGNATURE; - if (!strcmpW( info->pszAlgId, BCRYPT_SHA1_ALGORITHM )) hash_alg = GNUTLS_DIG_SHA1; - else if (!strcmpW( info->pszAlgId, BCRYPT_SHA256_ALGORITHM )) hash_alg = GNUTLS_DIG_SHA256; - else if (!strcmpW( info->pszAlgId, BCRYPT_SHA384_ALGORITHM )) hash_alg = GNUTLS_DIG_SHA384; - else if (!strcmpW( info->pszAlgId, BCRYPT_SHA512_ALGORITHM )) hash_alg = GNUTLS_DIG_SHA512; - else + if ((hash_alg = get_digest_from_id(info->pszAlgId)) == -1) { FIXME( "hash algorithm %s not supported\n", debugstr_w(info->pszAlgId) ); return STATUS_NOT_SUPPORTED; @@ -1107,26 +1117,130 @@ NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULO return (ret < 0) ? STATUS_INVALID_SIGNATURE : STATUS_SUCCESS; } +static unsigned int get_signature_length( enum alg_id id ) +{ + switch (id) + { + case ALG_ID_ECDSA_P256: return 64; + case ALG_ID_ECDSA_P384: return 96; + default: + FIXME( "unhandled algorithm %u\n", id ); + return 0; + } +} + +NTSTATUS format_gnutls_signature( enum alg_id type, gnutls_datum_t signature, UCHAR *output, + ULONG output_len, ULONG *ret_len ) +{ + switch (type) + { + case ALG_ID_RSA: + case ALG_ID_RSA_SIGN: + { + if (output_len < signature.size) return STATUS_BUFFER_TOO_SMALL; + memcpy( output, signature.data, signature.size ); + *ret_len = signature.size; + return STATUS_SUCCESS; + } + case ALG_ID_ECDSA_P256: + case ALG_ID_ECDSA_P384: + { + int err; + unsigned int pad_size, sig_len = get_signature_length( type ); + gnutls_datum_t r, s; /* format as r||s */ + + if ((err = pgnutls_decode_rs_value( &signature, &r, &s ))) + { + pgnutls_perror( err ); + return STATUS_INTERNAL_ERROR; + } + + if (output_len < sig_len) return STATUS_BUFFER_TOO_SMALL; + + /* remove prepended zero byte */ + if (r.size % 2) + { + r.size--; + r.data += 1; + } + if (s.size % 2) + { + s.size--; + s.data += 1; + } + + if (r.size != s.size || r.size + s.size > sig_len) + { + ERR( "we didn't get a correct signature\n" ); + return STATUS_INTERNAL_ERROR; + } + + pad_size = (sig_len / 2) - s.size; + memset( output, 0, sig_len ); + + memcpy( output + pad_size, r.data, r.size ); + memcpy( output + (sig_len / 2) + pad_size, s.data, s.size ); + + *ret_len = sig_len; + return STATUS_SUCCESS; + } + default: + return STATUS_INTERNAL_ERROR; + } +} + NTSTATUS key_asymmetric_sign( struct key *key, void *padding, UCHAR *input, ULONG input_len, UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) { BCRYPT_PKCS1_PADDING_INFO *pad = padding; gnutls_datum_t hash, signature; + gnutls_digest_algorithm_t hash_alg; + NTSTATUS status; int ret; - if (key->alg_id != ALG_ID_RSA && key->alg_id != ALG_ID_RSA_SIGN) + if (key->alg_id == ALG_ID_ECDSA_P256 || key->alg_id == ALG_ID_ECDSA_P384) { - FIXME( "algorithm %u not supported\n", key->alg_id ); - return STATUS_NOT_IMPLEMENTED; + /* With ECDSA, we find the digest algorithm from the hash length, and verify it */ + switch (input_len) + { + case 20: hash_alg = GNUTLS_DIG_SHA1; break; + case 32: hash_alg = GNUTLS_DIG_SHA256; break; + case 48: hash_alg = GNUTLS_DIG_SHA384; break; + case 64: hash_alg = GNUTLS_DIG_SHA512; break; + + default: + FIXME( "hash size %u not yet supported\n", input_len ); + return STATUS_INVALID_PARAMETER; + } + + if (flags == BCRYPT_PAD_PKCS1 && pad && pad->pszAlgId && get_digest_from_id( pad->pszAlgId ) != hash_alg) + { + WARN( "incorrect hashing algorithm %s, expected %u\n", debugstr_w(pad->pszAlgId), hash_alg ); + return STATUS_INVALID_PARAMETER; + } } - if (flags != BCRYPT_PAD_PKCS1) + else if (flags == BCRYPT_PAD_PKCS1) { - FIXME( "flags %08x not implemented\n", flags ); - return STATUS_NOT_IMPLEMENTED; + if (!pad || !pad->pszAlgId) + { + WARN( "padding info not found\n" ); + return STATUS_INVALID_PARAMETER; + } + + if ((hash_alg = get_digest_from_id( pad->pszAlgId )) == -1) + { + FIXME( "hash algorithm %s not recognized\n", debugstr_w(pad->pszAlgId) ); + return STATUS_NOT_SUPPORTED; + } + } + else if (!flags) + { + WARN( "invalid flags %08x\n", flags ); + return STATUS_INVALID_PARAMETER; } - if (!pad || !pad->pszAlgId || lstrcmpiW(pad->pszAlgId, BCRYPT_SHA1_ALGORITHM)) + else { - FIXME( "%s padding not implemented\n", debugstr_w(pad ? pad->pszAlgId : NULL) ); + FIXME( "flags %08x not implemented\n", flags ); return STATUS_NOT_IMPLEMENTED; } @@ -1143,17 +1257,16 @@ NTSTATUS key_asymmetric_sign( struct key *key, void *padding, UCHAR *input, ULON signature.data = NULL; signature.size = 0; - if ((ret = pgnutls_privkey_sign_hash( key->u.a.handle, GNUTLS_DIG_SHA1, 0, &hash, &signature ))) + if ((ret = pgnutls_privkey_sign_hash( key->u.a.handle, hash_alg, 0, &hash, &signature ))) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; } - if (output_len >= signature.size) memcpy( output, signature.data, signature.size ); - *ret_len = signature.size; + status = format_gnutls_signature( key->alg_id, signature, output, output_len, ret_len ); free( signature.data ); - return STATUS_SUCCESS; + return status; } NTSTATUS key_destroy( struct key *key )

1 0

Zebediah Figura : ddraw: Update the primary stateblock in d3d_device7_MultiplyTransform().
by Alexandre Julliard Dec. 6, 2019

Dec. 6, 2019

Module: wine Branch: master Commit: 98472693b00ee5a4e276ce6f73de27d727b97f43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98472693b00ee5a4e276ce6f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Dec 3 22:23:23 2019 -0600 ddraw: Update the primary stateblock in d3d_device7_MultiplyTransform(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index d4dd74f8ae..0999c01cb2 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3349,6 +3349,8 @@ static HRESULT d3d_device7_MultiplyTransform(IDirect3DDevice7 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); + wined3d_stateblock_multiply_transform(device->state, + wined3d_state, (struct wined3d_matrix *)matrix); wined3d_device_multiply_transform(device->wined3d_device, wined3d_state, (struct wined3d_matrix *)matrix); wined3d_mutex_unlock();

1 0