wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Jacek Caban : mshtml: Use script versioning 2 if we're not in quirks mode.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 80ea5a01ef42b0e9e0b6c872f8f5bbbf393c0ae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80ea5a01ef42b0e9e0b6c872f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 29 14:48:06 2016 +0100 mshtml: Use script versioning 2 if we're not in quirks mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/script.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 2a47f8a..01e5d5b 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -110,6 +110,26 @@ static void set_script_prop(ScriptHost *script_host, DWORD property, VARIANT *va WARN("SetProperty(%x) failed: %08x\n", property, hres); } +static BOOL is_quirks_mode(HTMLDocumentNode *doc) +{ + const WCHAR *compat_mode; + nsAString nsstr; + nsresult nsres; + BOOL ret = FALSE; + + static const WCHAR BackCompatW[] = {'B','a','c','k','C','o','m','p','a','t',0}; + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLDocument_GetCompatMode(doc->nsdoc, &nsstr); + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&nsstr, &compat_mode); + if(!strcmpW(compat_mode, BackCompatW)) + ret = TRUE; + } + nsAString_Finish(&nsstr); + return ret; +} + static BOOL init_script_engine(ScriptHost *script_host) { IObjectSafety *safety; @@ -148,7 +168,7 @@ static BOOL init_script_engine(ScriptHost *script_host) return FALSE; V_VT(&var) = VT_I4; - V_I4(&var) = 1; + V_I4(&var) = is_quirks_mode(script_host->window->doc) ? 1 : 2; set_script_prop(script_host, SCRIPTPROP_INVOKEVERSIONING, &var); V_VT(&var) = VT_BOOL;

1 0

Józef Kucia : wined3d: Recognize SM4 icb register.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 29c1e1fc1c5bcb35bccbb8996fb703471de2badf URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c1e1fc1c5bcb35bccbb8996… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 29 09:44:44 2016 +0100 wined3d: Recognize SM4 icb register. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 7 +++++++ dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 23 ++++++++++++----------- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5e983f9..5e9daaf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2406,6 +2406,13 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * sprintf(register_name, "%s_cb%u[%u]", prefix, reg->idx[0].offset, reg->idx[1].offset); break; + case WINED3DSPR_IMMCONSTBUFFER: + if (reg->idx[0].rel_addr) + sprintf(register_name, "%s_icb[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset); + else + sprintf(register_name, "%s_icb[%u]", prefix, reg->idx[0].offset); + break; + case WINED3DSPR_PRIMID: sprintf(register_name, "uint(gl_PrimitiveIDIn)"); break; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 4c42d2f..09b1fe9 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1459,6 +1459,10 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, TRACE("cb"); break; + case WINED3DSPR_IMMCONSTBUFFER: + TRACE("icb"); + break; + case WINED3DSPR_PRIMID: TRACE("primID"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 11de59c..64e1abb 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -155,16 +155,17 @@ enum wined3d_sm4_opcode enum wined3d_sm4_register_type { - WINED3D_SM4_RT_TEMP = 0x0, - WINED3D_SM4_RT_INPUT = 0x1, - WINED3D_SM4_RT_OUTPUT = 0x2, - WINED3D_SM4_RT_IMMCONST = 0x4, - WINED3D_SM4_RT_SAMPLER = 0x6, - WINED3D_SM4_RT_RESOURCE = 0x7, - WINED3D_SM4_RT_CONSTBUFFER = 0x8, - WINED3D_SM4_RT_PRIMID = 0xb, - WINED3D_SM4_RT_DEPTHOUT = 0xc, - WINED3D_SM4_RT_NULL = 0xd, + WINED3D_SM4_RT_TEMP = 0x0, + WINED3D_SM4_RT_INPUT = 0x1, + WINED3D_SM4_RT_OUTPUT = 0x2, + WINED3D_SM4_RT_IMMCONST = 0x4, + WINED3D_SM4_RT_SAMPLER = 0x6, + WINED3D_SM4_RT_RESOURCE = 0x7, + WINED3D_SM4_RT_CONSTBUFFER = 0x8, + WINED3D_SM4_RT_IMMCONSTBUFFER = 0x9, + WINED3D_SM4_RT_PRIMID = 0xb, + WINED3D_SM4_RT_DEPTHOUT = 0xc, + WINED3D_SM4_RT_NULL = 0xd, }; enum wined3d_sm4_output_primitive_type @@ -350,7 +351,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM4_RT_SAMPLER */ WINED3DSPR_SAMPLER, /* WINED3D_SM4_RT_RESOURCE */ WINED3DSPR_RESOURCE, /* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER, - /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_IMMCONSTBUFFER */ WINED3DSPR_IMMCONSTBUFFER, /* UNKNOWN */ 0, /* WINED3D_SM4_RT_PRIMID */ WINED3DSPR_PRIMID, /* WINED3D_SM4_RT_DEPTHOUT */ WINED3DSPR_DEPTHOUT, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0287088..4bd019f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -359,6 +359,7 @@ enum wined3d_shader_register_type WINED3DSPR_PREDICATE = 19, WINED3DSPR_IMMCONST, WINED3DSPR_CONSTBUFFER, + WINED3DSPR_IMMCONSTBUFFER, WINED3DSPR_PRIMID, WINED3DSPR_NULL, WINED3DSPR_RESOURCE,

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R16_UNORM format.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 4d162e2e6c767b5c88c4428426f12a97fbce2ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d162e2e6c767b5c88c442842… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 29 09:44:42 2016 +0100 wined3d: Add support for WINED3DFMT_R16_UNORM format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6891a1e..be6b32a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -104,6 +104,7 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_B10G10R10A2_UNORM, 10, 10, 10, 2, 20, 10, 0, 30, 4, 0, 0}, {WINED3DFMT_R16G16B16A16_UNORM, 16, 16, 16, 16, 0, 16, 32, 48, 8, 0, 0}, {WINED3DFMT_R8G8_UNORM, 8, 8, 0, 0, 0, 8, 0, 0, 2, 0, 0}, + {WINED3DFMT_R16_UNORM, 16, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, /* Luminance */ {WINED3DFMT_L8_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_L8A8_UNORM, 0, 0, 0, 8, 0, 0, 0, 8, 2, 0, 0}, @@ -1129,6 +1130,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RG, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R16_UNORM, GL_R16, GL_R16, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, + GL_RED, GL_UNSIGNED_SHORT, 0, + ARB_TEXTURE_RG, NULL}, /* Luminance */ {WINED3DFMT_L8_UNORM, GL_LUMINANCE8, GL_SLUMINANCE8_EXT, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, 0,

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R32G32B32_FLOAT format.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 5aef8a8b827a5d7a2d2eb31ccd4717d6691bee4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aef8a8b827a5d7a2d2eb31cc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 29 09:44:41 2016 +0100 wined3d: Add support for WINED3DFMT_R32G32B32_FLOAT format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6c2d08b..6891a1e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -992,6 +992,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RG, GL_FLOAT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_VTF, ARB_TEXTURE_RG, NULL}, + {WINED3DFMT_R32G32B32_FLOAT, GL_RGB32F, GL_RGB32F, 0, + GL_RGB, GL_FLOAT, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_FLOAT, NULL}, {WINED3DFMT_R32G32B32A32_FLOAT, GL_RGBA32F_ARB, GL_RGBA32F_ARB, 0, GL_RGBA, GL_FLOAT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_VTF,

1 0

Hugh McMaster : user32/tests: Add some expected WPARAM values to the SetFocusComboBox sequences.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: e7e33aecb3ff407406f7d146079d765503d8c4f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7e33aecb3ff407406f7d1460… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jan 29 20:15:56 2016 +1100 user32/tests: Add some expected WPARAM values to the SetFocusComboBox sequences. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index cdc0364..d20f28b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5942,7 +5942,7 @@ static const struct message WMSetFocusComboBoxSeq[] = { WM_SETFOCUS, sent }, { WM_KILLFOCUS, sent|parent }, { WM_SETFOCUS, sent }, - { WM_COMMAND, sent|defwinproc }, + { WM_COMMAND, sent|defwinproc|wparam, MAKEWPARAM(1001, EN_SETFOCUS) }, { EM_SETSEL, sent|defwinproc|wparam|lparam, 0, INT_MAX }, { WM_CTLCOLOREDIT, sent|defwinproc|optional },/* Not sent on W2000, XP or Server 2003 */ { WM_CTLCOLOREDIT, sent|parent|optional },/* Not sent on W2000, XP or Server 2003 */ @@ -5971,7 +5971,7 @@ static const struct message SetFocusComboBoxSeq[] = { WM_SETFOCUS, sent }, { WM_KILLFOCUS, sent|defwinproc }, { WM_SETFOCUS, sent }, - { WM_COMMAND, sent|defwinproc }, + { WM_COMMAND, sent|defwinproc|wparam, MAKEWPARAM(1001, EN_SETFOCUS) }, { EM_SETSEL, sent|defwinproc|wparam|lparam, 0, INT_MAX }, { WM_CTLCOLOREDIT, sent|defwinproc|optional },/* Not sent on W2000, XP or Server 2003 */ { WM_CTLCOLOREDIT, sent|parent|optional },/* Not sent on W2000, XP or Server 2003 */

1 0

Jacek Caban : bcrypt: Added BCRYPT_ALGORITHM_NAME property implementation.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: f13cff3a017652479c52cd1d9b6f38a5ca969e73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13cff3a017652479c52cd1d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 29 14:25:30 2016 +0100 bcrypt: Added BCRYPT_ALGORITHM_NAME property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.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 | 29 +++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 9afd3bc..ede37e3 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -182,11 +182,12 @@ enum alg_id static const struct { ULONG hash_length; + const WCHAR *alg_name; } alg_props[] = { - /* ALG_ID_SHA1 */ { 20 }, - /* ALG_ID_SHA256 */ { 32 }, - /* ALG_ID_SHA384 */ { 48 }, - /* ALG_ID_SHA512 */ { 64 } + /* ALG_ID_SHA1 */ { 20, BCRYPT_SHA1_ALGORITHM }, + /* ALG_ID_SHA256 */ { 32, BCRYPT_SHA256_ALGORITHM }, + /* ALG_ID_SHA384 */ { 48, BCRYPT_SHA384_ALGORITHM }, + /* ALG_ID_SHA512 */ { 64, BCRYPT_SHA512_ALGORITHM } }; struct algorithm @@ -442,6 +443,16 @@ static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR * return STATUS_SUCCESS; } + if (!strcmpW( prop, BCRYPT_ALGORITHM_NAME )) + { + *ret_size = (strlenW(alg_props[id].alg_name)+1)*sizeof(WCHAR); + if (size < *ret_size) + return STATUS_BUFFER_TOO_SMALL; + if(buf) + memcpy(buf, alg_props[id].alg_name, *ret_size); + return STATUS_SUCCESS; + } + return STATUS_NOT_IMPLEMENTED; } diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index ce788ee..2613a07 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -79,6 +79,13 @@ static void format_hash(const UCHAR *bytes, ULONG size, char *buf) return; } +static int strcmp_wa(const WCHAR *strw, const char *stra) +{ + WCHAR buf[512]; + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(buf[0])); + return lstrcmpW(strw, buf); +} + #define test_hash_length(a,b) _test_hash_length(__LINE__,a,b) static void _test_hash_length(unsigned line, void *handle, ULONG exlen) { @@ -91,6 +98,20 @@ static void _test_hash_length(unsigned line, void *handle, ULONG exlen) ok_(__FILE__,line)(len == exlen, "len = %u, expected %u\n", len, exlen); } +#define test_alg_name(a,b) _test_alg_name(__LINE__,a,b) +static void _test_alg_name(unsigned line, void *handle, const char *exname) +{ + ULONG size = 0xdeadbeef; + UCHAR buf[256]; + const WCHAR *name = (const WCHAR*)buf; + NTSTATUS status; + + status = BCryptGetProperty(handle, BCRYPT_ALGORITHM_NAME, buf, sizeof(buf), &size, 0); + ok_(__FILE__,line)(status == STATUS_SUCCESS, "BCryptGetProperty failed: %08x\n", status); + ok_(__FILE__,line)(size == (strlen(exname)+1)*sizeof(WCHAR), "got %u\n", size); + ok_(__FILE__,line)(!strcmp_wa(name, exname), "alg name = %s, expected %s\n", wine_dbgstr_w(name), exname); +} + static void test_sha1(void) { static const char expected[] = "961fa64958818f767707072755d7018dcd278e94"; @@ -136,6 +157,7 @@ static void test_sha1(void) ok(size == sizeof(len), "got %u\n", size); test_hash_length(alg, 20); + test_alg_name(alg, "SHA1"); hash = NULL; len = sizeof(buf); @@ -147,6 +169,7 @@ static void test_sha1(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); test_hash_length(hash, 20); + test_alg_name(hash, "SHA1"); memset(sha1, 0, sizeof(sha1)); ret = BCryptFinishHash(hash, sha1, sizeof(sha1), 0); @@ -207,6 +230,7 @@ static void test_sha256(void) ok(size == sizeof(len), "got %u\n", size); test_hash_length(alg, 32); + test_alg_name(alg, "SHA256"); hash = NULL; len = sizeof(buf); @@ -218,6 +242,7 @@ static void test_sha256(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); test_hash_length(hash, 32); + test_alg_name(hash, "SHA256"); memset(sha256, 0, sizeof(sha256)); ret = BCryptFinishHash(hash, sha256, sizeof(sha256), 0); @@ -278,6 +303,7 @@ static void test_sha384(void) ok(size == sizeof(len), "got %u\n", size); test_hash_length(alg, 48); + test_alg_name(alg, "SHA384"); hash = NULL; len = sizeof(buf); @@ -289,6 +315,7 @@ static void test_sha384(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); test_hash_length(hash, 48); + test_alg_name(hash, "SHA384"); memset(sha384, 0, sizeof(sha384)); ret = BCryptFinishHash(hash, sha384, sizeof(sha384), 0); @@ -350,6 +377,7 @@ static void test_sha512(void) ok(size == sizeof(len), "got %u\n", size); test_hash_length(alg, 64); + test_alg_name(alg, "SHA512"); hash = NULL; len = sizeof(buf); @@ -361,6 +389,7 @@ static void test_sha512(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); test_hash_length(hash, 64); + test_alg_name(hash, "SHA512"); memset(sha512, 0, sizeof(sha512)); ret = BCryptFinishHash(hash, sha512, sizeof(sha512), 0);

1 0

Jacek Caban : bcrypt: Make BCRYPT_HASH_LENGTH implementation more generic.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: f0e499f292173fdd40aee2f11934e7e679f26bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e499f292173fdd40aee2f11… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 29 14:25:23 2016 +0100 bcrypt: Make BCRYPT_HASH_LENGTH implementation more generic. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 118 +++++++++++++++------------------------------- 1 file changed, 37 insertions(+), 81 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index e6da379..9afd3bc 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -174,10 +174,19 @@ struct object enum alg_id { - ALG_ID_SHA1 = 1, - ALG_ID_SHA256 = 2, - ALG_ID_SHA384 = 3, - ALG_ID_SHA512 = 4 + ALG_ID_SHA1, + ALG_ID_SHA256, + ALG_ID_SHA384, + ALG_ID_SHA512 +}; + +static const struct { + ULONG hash_length; +} alg_props[] = { + /* ALG_ID_SHA1 */ { 20 }, + /* ALG_ID_SHA256 */ { 32 }, + /* ALG_ID_SHA384 */ { 48 }, + /* ALG_ID_SHA512 */ { 64 } }; struct algorithm @@ -421,15 +430,30 @@ static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size ) #define OBJECT_LENGTH_SHA384 382 #define OBJECT_LENGTH_SHA512 382 -#define HASH_DIGEST_LENGTH_SHA1 20 -#define HASH_DIGEST_LENGTH_SHA256 32 -#define HASH_DIGEST_LENGTH_SHA384 48 -#define HASH_DIGEST_LENGTH_SHA512 64 +static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) + { + *ret_size = sizeof(ULONG); + if (size < sizeof(ULONG)) + return STATUS_BUFFER_TOO_SMALL; + if(buf) + *(ULONG*)buf = alg_props[id].hash_length; + return STATUS_SUCCESS; + } + + return STATUS_NOT_IMPLEMENTED; +} static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { + NTSTATUS status; ULONG value; + status = generic_alg_property( id, prop, buf, size, ret_size ); + if (status != STATUS_NOT_IMPLEMENTED) + return status; + switch (id) { case ALG_ID_SHA1: @@ -438,11 +462,6 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, value = OBJECT_LENGTH_SHA1; break; } - else if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) - { - value = HASH_DIGEST_LENGTH_SHA1; - break; - } FIXME( "unsupported sha1 algorithm property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; @@ -452,11 +471,6 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, value = OBJECT_LENGTH_SHA256; break; } - else if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) - { - value = HASH_DIGEST_LENGTH_SHA256; - break; - } FIXME( "unsupported sha256 algorithm property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; @@ -466,11 +480,6 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, value = OBJECT_LENGTH_SHA384; break; } - else if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) - { - value = HASH_DIGEST_LENGTH_SHA384; - break; - } FIXME( "unsupported sha384 algorithm property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; @@ -480,11 +489,6 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, value = OBJECT_LENGTH_SHA512; break; } - else if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) - { - value = HASH_DIGEST_LENGTH_SHA512; - break; - } FIXME( "unsupported sha512 algorithm property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; @@ -506,60 +510,12 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, static NTSTATUS get_hash_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { - ULONG value; - - switch (id) - { - case ALG_ID_SHA1: - if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) - { - value = HASH_DIGEST_LENGTH_SHA1; - break; - } - FIXME( "unsupported sha1 hash property %s\n", debugstr_w(prop) ); - return STATUS_NOT_IMPLEMENTED; - - case ALG_ID_SHA256: - if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) - { - value = HASH_DIGEST_LENGTH_SHA256; - break; - } - FIXME( "unsupported sha256 hash property %s\n", debugstr_w(prop) ); - return STATUS_NOT_IMPLEMENTED; - - case ALG_ID_SHA384: - if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) - { - value = HASH_DIGEST_LENGTH_SHA384; - break; - } - FIXME( "unsupported sha384 hash property %s\n", debugstr_w(prop) ); - return STATUS_NOT_IMPLEMENTED; - - case ALG_ID_SHA512: - if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) - { - value = HASH_DIGEST_LENGTH_SHA512; - break; - } - FIXME( "unsupported sha512 hash property %s\n", debugstr_w(prop) ); - return STATUS_NOT_IMPLEMENTED; - - default: - FIXME( "unsupported hash %u\n", id ); - return STATUS_NOT_IMPLEMENTED; - } - - if (size < sizeof(ULONG)) - { - *ret_size = sizeof(ULONG); - return STATUS_BUFFER_TOO_SMALL; - } - if (buf) *(ULONG *)buf = value; - *ret_size = sizeof(ULONG); + NTSTATUS status; - return STATUS_SUCCESS; + status = generic_alg_property( id, prop, buf, size, ret_size ); + if (status == STATUS_NOT_IMPLEMENTED) + FIXME( "unsupported property %s\n", debugstr_w(prop) ); + return status; } NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *buffer, ULONG count, ULONG *res, ULONG flags )

1 0

Jacek Caban : bcrypt: Make BCRYPT_HASH_LENGTH tests more generic.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 08d2b8ef47126154ad3a5101bd111063a1bb60a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08d2b8ef47126154ad3a5101b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 29 14:25:11 2016 +0100 bcrypt: Make BCRYPT_HASH_LENGTH tests more generic. Signed-off-by: Jacek Caban <jacek(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 | 60 ++++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 40 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 5435d4b..ce788ee 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -79,6 +79,18 @@ static void format_hash(const UCHAR *bytes, ULONG size, char *buf) return; } +#define test_hash_length(a,b) _test_hash_length(__LINE__,a,b) +static void _test_hash_length(unsigned line, void *handle, ULONG exlen) +{ + ULONG len = 0xdeadbeef, size = 0xdeadbeef; + NTSTATUS status; + + status = BCryptGetProperty(handle, BCRYPT_HASH_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok_(__FILE__,line)(status == STATUS_SUCCESS, "BCryptGetProperty failed: %08x\n", status); + ok_(__FILE__,line)(size == sizeof(len), "got %u\n", size); + ok_(__FILE__,line)(len == exlen, "len = %u, expected %u\n", len, exlen); +} + static void test_sha1(void) { static const char expected[] = "961fa64958818f767707072755d7018dcd278e94"; @@ -123,11 +135,7 @@ static void test_sha1(void) ok(len != 0xdeadbeef, "len not set\n"); ok(size == sizeof(len), "got %u\n", size); - len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_HASH_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(len == 20, "got %u\n", len); - ok(size == sizeof(len), "got %u\n", size); + test_hash_length(alg, 20); hash = NULL; len = sizeof(buf); @@ -138,11 +146,7 @@ static void test_sha1(void) ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - len = size = 0xdeadbeef; - ret = BCryptGetProperty(hash, BCRYPT_HASH_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(len == 20, "got %u\n", len); - ok(size == sizeof(len), "got %u\n", size); + test_hash_length(hash, 20); memset(sha1, 0, sizeof(sha1)); ret = BCryptFinishHash(hash, sha1, sizeof(sha1), 0); @@ -202,11 +206,7 @@ static void test_sha256(void) ok(len != 0xdeadbeef, "len not set\n"); ok(size == sizeof(len), "got %u\n", size); - len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_HASH_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(len == 32, "got %u\n", len); - ok(size == sizeof(len), "got %u\n", size); + test_hash_length(alg, 32); hash = NULL; len = sizeof(buf); @@ -217,11 +217,7 @@ static void test_sha256(void) ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - len = size = 0xdeadbeef; - ret = BCryptGetProperty(hash, BCRYPT_HASH_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(len == 32, "got %u\n", len); - ok(size == sizeof(len), "got %u\n", size); + test_hash_length(hash, 32); memset(sha256, 0, sizeof(sha256)); ret = BCryptFinishHash(hash, sha256, sizeof(sha256), 0); @@ -281,11 +277,7 @@ static void test_sha384(void) ok(len != 0xdeadbeef, "len not set\n"); ok(size == sizeof(len), "got %u\n", size); - len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_HASH_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(len == 48, "got %u\n", len); - ok(size == sizeof(len), "got %u\n", size); + test_hash_length(alg, 48); hash = NULL; len = sizeof(buf); @@ -296,11 +288,7 @@ static void test_sha384(void) ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - len = size = 0xdeadbeef; - ret = BCryptGetProperty(hash, BCRYPT_HASH_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(len == 48, "got %u\n", len); - ok(size == sizeof(len), "got %u\n", size); + test_hash_length(hash, 48); memset(sha384, 0, sizeof(sha384)); ret = BCryptFinishHash(hash, sha384, sizeof(sha384), 0); @@ -361,11 +349,7 @@ static void test_sha512(void) ok(len != 0xdeadbeef, "len not set\n"); ok(size == sizeof(len), "got %u\n", size); - len = size = 0xdeadbeef; - ret = BCryptGetProperty(alg, BCRYPT_HASH_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(len == 64, "got %u\n", len); - ok(size == sizeof(len), "got %u\n", size); + test_hash_length(alg, 64); hash = NULL; len = sizeof(buf); @@ -376,11 +360,7 @@ static void test_sha512(void) ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - len = size = 0xdeadbeef; - ret = BCryptGetProperty(hash, BCRYPT_HASH_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); - ok(ret == STATUS_SUCCESS, "got %08x\n", ret); - ok(len == 64, "got %u\n", len); - ok(size == sizeof(len), "got %u\n", size); + test_hash_length(hash, 64); memset(sha512, 0, sizeof(sha512)); ret = BCryptFinishHash(hash, sha512, sizeof(sha512), 0);

1 0

Joachim Priesner : scrrun: Implement filesys_GetDrive for local drives.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: c1dd22898136604a576c1bed8818da8ef3ed1eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1dd22898136604a576c1bed8… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Thu Jan 28 17:13:22 2016 +0100 scrrun: Implement filesys_GetDrive for local drives. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 35 ++++++++++++++++- dlls/scrrun/tests/filesystem.c | 89 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 98895cc..818079e 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3272,9 +3272,40 @@ static HRESULT WINAPI filesys_FolderExists(IFileSystem3 *iface, BSTR path, VARIA static HRESULT WINAPI filesys_GetDrive(IFileSystem3 *iface, BSTR DriveSpec, IDrive **ppdrive) { - FIXME("%p %s %p\n", iface, debugstr_w(DriveSpec), ppdrive); + UINT len; + HRESULT hr; + WCHAR driveletter; + VARIANT_BOOL drive_exists; - return E_NOTIMPL; + TRACE("%p %s %p\n", iface, debugstr_w(DriveSpec), ppdrive); + + if (!ppdrive) + return E_POINTER; + + *ppdrive = NULL; + + /* DriveSpec may be one of: 'x', 'x:', 'x:\', '\\computer\share' */ + len = SysStringLen(DriveSpec); + if (!len) + return E_INVALIDARG; + else if (len <= 3) { + driveletter = toupperW(DriveSpec[0]); + if (driveletter < 'A' || driveletter > 'Z' + || (len >= 2 && DriveSpec[1] != ':') + || (len == 3 && DriveSpec[2] != '\\')) + return E_INVALIDARG; + hr = IFileSystem3_DriveExists(iface, DriveSpec, &drive_exists); + if (FAILED(hr)) + return hr; + if (drive_exists == VARIANT_FALSE) + return CTL_E_DEVICEUNAVAILABLE; + return create_drive(driveletter, ppdrive); + } else { + if (DriveSpec[0] != '\\' || DriveSpec[1] != '\\') + return E_INVALIDARG; + FIXME("%s not implemented yet\n", debugstr_w(DriveSpec)); + return E_NOTIMPL; + } } static HRESULT WINAPI filesys_GetFile(IFileSystem3 *iface, BSTR FilePath, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 33f403c..8457714 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1953,6 +1953,94 @@ static void test_GetDriveName(void) } } +struct getdrive_test { + const WCHAR drivespec[12]; + HRESULT res; + const WCHAR driveletter[2]; +}; + +static void test_GetDrive(void) +{ + HRESULT hr; + IDrive *drive_fixed, *drive; + BSTR dl_fixed, drivespec; + WCHAR root[] = {'?',':','\\',0}; + + drive = (void*)0xdeadbeef; + hr = IFileSystem3_GetDrive(fs3, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(drive == (void*)0xdeadbeef, "got %p\n", drive); + + for (root[0] = 'A'; root[0] <= 'Z'; root[0]++) + if (GetDriveTypeW(root) == DRIVE_NO_ROOT_DIR) + break; + + if (root[0] > 'Z') + skip("All drive letters are occupied, skipping test for nonexisting drive.\n"); + else { + drivespec = SysAllocString(root); + drive = (void*)0xdeadbeef; + hr = IFileSystem3_GetDrive(fs3, drivespec, &drive); + ok(hr == CTL_E_DEVICEUNAVAILABLE, "got 0x%08x\n", hr); + ok(drive == NULL, "got %p\n", drive); + SysFreeString(drivespec); + } + + drive_fixed = get_fixed_drive(); + if (!drive_fixed) { + skip("No fixed drive found, skipping test.\n"); + return; + } + + hr = IDrive_get_DriveLetter(drive_fixed, &dl_fixed); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if (FAILED(hr)) + skip("Could not retrieve drive letter of fixed drive, skipping test.\n"); + else { + WCHAR dl_upper = toupper(dl_fixed[0]); + WCHAR dl_lower = tolower(dl_fixed[0]); + struct getdrive_test testdata[] = { + { {dl_upper,0}, S_OK, {dl_upper,0} }, + { {dl_upper,':',0}, S_OK, {dl_upper,0} }, + { {dl_upper,':','\\',0}, S_OK, {dl_upper,0} }, + { {dl_lower,':','\\',0}, S_OK, {dl_upper,0} }, + { {dl_upper,'\\',0}, E_INVALIDARG, { 0 } }, + { {dl_lower,'\\',0}, E_INVALIDARG, { 0 } }, + { {'$',':','\\',0}, E_INVALIDARG, { 0 } }, + { {'\\','h','o','s','t','\\','s','h','a','r','e',0}, E_INVALIDARG, { 0 } }, + { {'h','o','s','t','\\','s','h','a','r','e',0}, E_INVALIDARG, { 0 } }, + { { 0 } }, + }; + struct getdrive_test *ptr = &testdata[0]; + + for (; *ptr->drivespec; ptr++) { + drivespec = SysAllocString(ptr->drivespec); + drive = (void*)0xdeadbeef; + hr = IFileSystem3_GetDrive(fs3, drivespec, &drive); + ok(hr == ptr->res, "got 0x%08x, expected 0x%08x for drive spec %s\n", + hr, ptr->res, wine_dbgstr_w(ptr->drivespec)); + ok(!lstrcmpW(ptr->drivespec, drivespec), "GetDrive modified its DriveSpec argument\n"); + SysFreeString(drivespec); + + if (*ptr->driveletter) { + BSTR driveletter; + hr = IDrive_get_DriveLetter(drive, &driveletter); + ok(hr == S_OK, "got 0x%08x for drive spec %s\n", hr, wine_dbgstr_w(ptr->drivespec)); + if (SUCCEEDED(hr)) { + ok(!lstrcmpW(ptr->driveletter, driveletter), "got %s, expected %s for drive spec %s\n", + wine_dbgstr_w(driveletter), wine_dbgstr_w(ptr->driveletter), + wine_dbgstr_w(ptr->drivespec)); + SysFreeString(driveletter); + } + IDrive_Release(drive); + } else + ok(drive == NULL, "got %p for drive spec %s\n", drive, wine_dbgstr_w(ptr->drivespec)); + } + SysFreeString(dl_fixed); + } +} + static void test_SerialNumber(void) { IDrive *drive; @@ -2111,6 +2199,7 @@ START_TEST(filesystem) test_Read(); test_DriveExists(); test_GetDriveName(); + test_GetDrive(); test_SerialNumber(); test_GetExtensionName(); test_GetSpecialFolder();

1 0

Joachim Priesner : scrrun/tests: Move code to get a fixed drive to a function.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 9b0a9c4dea4c0e15ba22d62cdb53b459a3e96cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b0a9c4dea4c0e15ba22d62cd… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Thu Jan 28 17:13:11 2016 +0100 scrrun/tests: Move code to get a fixed drive to a function. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 77 ++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 32 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index b80540d..33f403c 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -59,6 +59,47 @@ static inline void get_temp_path(const WCHAR *prefix, WCHAR *path) DeleteFileW(path); } +static IDrive *get_fixed_drive(void) +{ + IDriveCollection *drives; + IEnumVARIANT *iter; + IDrive *drive; + HRESULT hr; + + hr = IFileSystem3_get_Drives(fs3, &drives); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDriveCollection_get__NewEnum(drives, (IUnknown**)&iter); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDriveCollection_Release(drives); + + while (1) { + DriveTypeConst type; + VARIANT var; + + hr = IEnumVARIANT_Next(iter, 1, &var, NULL); + if (hr == S_FALSE) { + drive = NULL; + break; + } + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IDrive, (void**)&drive); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&var); + + hr = IDrive_get_DriveType(drive, &type); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (type == Fixed) + break; + + IDrive_Release(drive); + } + + IEnumVARIANT_Release(iter); + return drive; +} + static void test_interfaces(void) { static const WCHAR nonexistent_dirW[] = { @@ -1914,42 +1955,15 @@ static void test_GetDriveName(void) static void test_SerialNumber(void) { - IDriveCollection *drives; - IEnumVARIANT *iter; IDrive *drive; LONG serial; HRESULT hr; BSTR name; - hr = IFileSystem3_get_Drives(fs3, &drives); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IDriveCollection_get__NewEnum(drives, (IUnknown**)&iter); - ok(hr == S_OK, "got 0x%08x\n", hr); - IDriveCollection_Release(drives); - - while (1) { - DriveTypeConst type; - VARIANT var; - - hr = IEnumVARIANT_Next(iter, 1, &var, NULL); - if (hr == S_FALSE) { - skip("No fixed drive found, skipping test.\n"); - IEnumVARIANT_Release(iter); - return; - } - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IDrive, (void**)&drive); - ok(hr == S_OK, "got 0x%08x\n", hr); - VariantClear(&var); - - hr = IDrive_get_DriveType(drive, &type); - ok(hr == S_OK, "got 0x%08x\n", hr); - if (type == Fixed) - break; - - IDrive_Release(drive); + drive = get_fixed_drive(); + if (!drive) { + skip("No fixed drive found, skipping test.\n"); + return; } hr = IDrive_get_SerialNumber(drive, NULL); @@ -1979,7 +1993,6 @@ static void test_SerialNumber(void) SysFreeString(name); IDrive_Release(drive); - IEnumVARIANT_Release(iter); } static const struct extension_test {

1 0

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 January 2016